diff --git a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java index 2a71ff893e..d9c470b5d9 100644 --- a/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java +++ b/lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java @@ -42,7 +42,7 @@ public class PrettierFormatterStep { public static final String NAME = "prettier-format"; public static final Map defaultDevDependencies() { - return defaultDevDependenciesWithPrettier("1.16.4"); + return defaultDevDependenciesWithPrettier("2.0.5"); } public static final Map defaultDevDependenciesWithPrettier(String version) { diff --git a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java index 1a948bd366..e815ea1f63 100644 --- a/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java +++ b/lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java @@ -59,8 +59,8 @@ public static Map defaultDevDependencies() { public static Map defaultDevDependenciesWithTsFmt(String typescriptFormatter) { TreeMap defaults = new TreeMap<>(); defaults.put("typescript-formatter", typescriptFormatter); - defaults.put("typescript", "3.3.3"); - defaults.put("tslint", "5.12.1"); + defaults.put("typescript", "3.9.5"); + defaults.put("tslint", "6.1.2"); return defaults; } diff --git a/plugin-gradle/README.md b/plugin-gradle/README.md index ea07c07777..5b2835d70b 100644 --- a/plugin-gradle/README.md +++ b/plugin-gradle/README.md @@ -425,7 +425,7 @@ spotless { target '**/*.css', '**/*.scss' // at least provide the parser to use - prettier().config(['parser': 'postcss']) + prettier().config(['parser': 'css']) // prettier('1.16.4') to specify specific version of prettier // prettier(['my-prettier-fork': '1.16.4']) to specify exactly which npm packages to use @@ -447,7 +447,7 @@ spotless { prettier().configFile('/path-to/.prettierrc.yml') // or provide both (config options take precedence over configFile options) - prettier().config(['parser': 'postcss']).configFile('path-to/.prettierrc.yml') + prettier().config(['parser': 'css']).configFile('path-to/.prettierrc.yml') } } ``` diff --git a/testlib/src/main/resources/npm/prettier/filetypes/css/.prettierrc.yml b/testlib/src/main/resources/npm/prettier/filetypes/css/.prettierrc.yml index 9919fdc796..1141920e4e 100644 --- a/testlib/src/main/resources/npm/prettier/filetypes/css/.prettierrc.yml +++ b/testlib/src/main/resources/npm/prettier/filetypes/css/.prettierrc.yml @@ -1 +1 @@ -parser: postcss +parser: css diff --git a/testlib/src/main/resources/npm/prettier/filetypes/javascript-es5/javascript-es5.clean b/testlib/src/main/resources/npm/prettier/filetypes/javascript-es5/javascript-es5.clean index 86cbfca970..29002f6b05 100644 --- a/testlib/src/main/resources/npm/prettier/filetypes/javascript-es5/javascript-es5.clean +++ b/testlib/src/main/resources/npm/prettier/filetypes/javascript-es5/javascript-es5.clean @@ -18,7 +18,7 @@ var numbers = [ 17, 18, 19, - 20 + 20, ]; var p = { @@ -26,7 +26,7 @@ var p = { last: "Pan", get fullName() { return this.first + " " + this.last; - } + }, }; var str = "Hello, world!"; diff --git a/testlib/src/main/resources/npm/prettier/filetypes/javascript-es6/javascript-es6.clean b/testlib/src/main/resources/npm/prettier/filetypes/javascript-es6/javascript-es6.clean index 6737291a0a..d4e982d69f 100644 --- a/testlib/src/main/resources/npm/prettier/filetypes/javascript-es6/javascript-es6.clean +++ b/testlib/src/main/resources/npm/prettier/filetypes/javascript-es6/javascript-es6.clean @@ -18,7 +18,7 @@ var numbers = [ 17, 18, 19, - 20 + 20, ]; const p = { @@ -26,7 +26,7 @@ const p = { last: "Pan", get fullName() { return this.first + " " + this.last; - } + }, }; const str = "Hello, world!"; diff --git a/testlib/src/main/resources/npm/prettier/filetypes/scss/.prettierrc.yml b/testlib/src/main/resources/npm/prettier/filetypes/scss/.prettierrc.yml index 9919fdc796..1141920e4e 100644 --- a/testlib/src/main/resources/npm/prettier/filetypes/scss/.prettierrc.yml +++ b/testlib/src/main/resources/npm/prettier/filetypes/scss/.prettierrc.yml @@ -1 +1 @@ -parser: postcss +parser: css