Skip to content

Commit 9c242a2

Browse files
authored
Update Prettier & add prettier button back (codesandbox#520)
* Update prettier * Add Prettify button back
1 parent a6f3c5c commit 9c242a2

File tree

18 files changed

+24088
-19645
lines changed

18 files changed

+24088
-19645
lines changed

packages/app/src/app/pages/Sandbox/Editor/Content/Tabs/index.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,15 @@ import React from 'react';
22
import { inject, observer } from 'mobx-react';
33

44
import { canPrettify } from 'app/utils/prettify';
5+
import Tooltip from 'common/components/Tooltip';
56
import TabContainer from './TabContainer';
67

7-
import { Container, TabsContainer, IconContainer } from './elements';
8+
import {
9+
Container,
10+
TabsContainer,
11+
IconContainer,
12+
StyledPrettierIcon,
13+
} from './elements';
814

915
class EditorTabs extends React.Component {
1016
componentWillMount() {
@@ -64,10 +70,8 @@ class EditorTabs extends React.Component {
6470
};
6571

6672
prettifyModule = () => {
67-
const { currentSandbox } = this.props.store.editor;
68-
6973
this.props.signals.editor.prettifyClicked({
70-
moduleShortid: currentSandbox.currentModuleShortid,
74+
moduleShortid: this.props.store.editor.currentModuleShortid,
7175
});
7276
};
7377

@@ -166,12 +170,12 @@ class EditorTabs extends React.Component {
166170
})}
167171
</TabsContainer>
168172
<IconContainer>
169-
{/* <Tooltip title="Prettify">
173+
<Tooltip title="Prettify">
170174
<StyledPrettierIcon
171175
disabled={!this.canPrettify(currentModule)}
172176
onClick={this.prettifyModule}
173177
/>
174-
</Tooltip> */}
178+
</Tooltip>
175179
</IconContainer>
176180
</Container>
177181
);

packages/app/src/app/utils/prettify.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,18 @@ function getMode(title: string) {
2828
return 'postcss';
2929
}
3030

31-
if (/\.scss$/.test(title)) {
31+
if (/\.s[c|a]ss$/.test(title)) {
3232
return 'postcss';
3333
}
3434

3535
if (/\.less$/.test(title)) {
3636
return 'postcss';
3737
}
3838

39+
if (/\.vue$/.test(title)) {
40+
return 'vue';
41+
}
42+
3943
if (/\.gql$/.test(title)) {
4044
return 'graphql';
4145
}

packages/app/static/js/prettier/1.10.2/index.js

Lines changed: 2493 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/app/static/js/prettier/1.10.2/parser-babylon.js

Lines changed: 2174 additions & 0 deletions
Large diffs are not rendered by default.

packages/app/static/js/prettier/1.10.2/parser-flow.js

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/app/static/js/prettier/1.10.2/parser-graphql.js

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/app/static/js/prettier/1.10.2/parser-markdown.js

Lines changed: 248 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/app/static/js/prettier/1.10.2/parser-parse5.js

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)