Skip to content

Commit b9ca8ba

Browse files
committed
Upgrade Prettier to 1.15.1
1 parent 3e2aea8 commit b9ca8ba

23 files changed

+63042
-36051
lines changed

packages/app/src/app/components/CodeEditor/VSCode/index.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ class MonacoEditor extends React.Component<Props, State> implements Editor {
238238
};
239239

240240
provideDocumentFormattingEdits = (model, options, token) =>
241-
prettify(
241+
console.log('prettify') || prettify(
242242
model.uri.fsPath,
243243
() => model.getValue(),
244244
this.getPrettierConfig(),
@@ -277,6 +277,11 @@ class MonacoEditor extends React.Component<Props, State> implements Editor {
277277
monaco.languages.registerDocumentFormattingEditProvider('sass', this);
278278
monaco.languages.registerDocumentFormattingEditProvider('vue', this);
279279
monaco.languages.registerDocumentFormattingEditProvider('graphql', this);
280+
monaco.languages.registerDocumentFormattingEditProvider('html', this);
281+
monaco.languages.registerDocumentFormattingEditProvider('markdown', this);
282+
monaco.languages.registerDocumentFormattingEditProvider('json', this);
283+
284+
console.log('hey');
280285

281286
// eslint-disable-next-line no-underscore-dangle
282287
window.CSEditor = {

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

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ function getMode(title: string) {
1616
}
1717

1818
if (/\.css$/.test(title)) {
19-
return 'postcss';
19+
return 'css';
2020
}
2121

2222
if (/\.s[c|a]ss$/.test(title)) {
23-
return 'postcss';
23+
return 'scss';
2424
}
2525

2626
if (/\.less$/.test(title)) {
27-
return 'postcss';
27+
return 'less';
2828
}
2929

3030
if (/\.vue$/.test(title)) {
@@ -35,6 +35,26 @@ function getMode(title: string) {
3535
return 'graphql';
3636
}
3737

38+
if (/\.html$/.test(title)) {
39+
return 'html';
40+
}
41+
42+
if (/\.md$/.test(title)) {
43+
return 'markdown';
44+
}
45+
46+
if (/\.mdx$/.test(title)) {
47+
return 'mdx';
48+
}
49+
50+
if (/\.json$/.test(title)) {
51+
return 'json5';
52+
}
53+
54+
if (/\.component\.html$/.test(title)) {
55+
return 'angular';
56+
}
57+
3858
return null;
3959
}
4060

@@ -128,7 +148,7 @@ export default function prettify(
128148
) {
129149
const mode = getMode(title);
130150

131-
worker = worker || new Worker('/static/js/prettier/worker.js');
151+
worker = worker || new Worker('/static/js/prettier/worker-1.15.1.js');
132152

133153
return new Promise((resolve, reject) => {
134154
if (cancellationToken && cancellationToken.isCancellationRequested) {

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

Lines changed: 0 additions & 2493 deletions
This file was deleted.

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

Lines changed: 0 additions & 2174 deletions
This file was deleted.

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

Lines changed: 0 additions & 9 deletions
This file was deleted.

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

Lines changed: 0 additions & 18 deletions
This file was deleted.

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

Lines changed: 0 additions & 248 deletions
This file was deleted.

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

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)