From 5ed707f5d18341a14cb27a6b000e4cc848f49ec2 Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Fri, 28 Oct 2022 08:20:37 -0400 Subject: [PATCH 1/5] Remove .prettierrc files --- code/.prettierrc | 8 -------- scripts/.prettierrc | 8 -------- 2 files changed, 16 deletions(-) delete mode 100644 code/.prettierrc delete mode 100644 scripts/.prettierrc diff --git a/code/.prettierrc b/code/.prettierrc deleted file mode 100644 index d033feea7ad5..000000000000 --- a/code/.prettierrc +++ /dev/null @@ -1,8 +0,0 @@ -{ - "printWidth": 100, - "tabWidth": 2, - "bracketSpacing": true, - "trailingComma": "es5", - "singleQuote": true, - "arrowParens": "always" -} diff --git a/scripts/.prettierrc b/scripts/.prettierrc deleted file mode 100644 index d033feea7ad5..000000000000 --- a/scripts/.prettierrc +++ /dev/null @@ -1,8 +0,0 @@ -{ - "printWidth": 100, - "tabWidth": 2, - "bracketSpacing": true, - "trailingComma": "es5", - "singleQuote": true, - "arrowParens": "always" -} From d99ed8af01c3a7652f1ebf8fe9df6769f49722fc Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Fri, 28 Oct 2022 08:20:58 -0400 Subject: [PATCH 2/5] Remove html parser override --- scripts/prettier.config.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/scripts/prettier.config.js b/scripts/prettier.config.js index c2fbdcbf6eda..b1a30ba19f81 100644 --- a/scripts/prettier.config.js +++ b/scripts/prettier.config.js @@ -3,10 +3,4 @@ const base = require('@storybook/linter-config/prettier.config'); module.exports = { ...base, arrowParens: 'always', - overrides: [ - { - files: '*.html', - options: { parser: 'babel' }, - }, - ], }; From 40381d20024c41d2a4c22f5c0b56279fc8ac5951 Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Fri, 28 Oct 2022 08:29:54 -0400 Subject: [PATCH 3/5] Allow up to prettier 3 --- code/lib/codemod/package.json | 2 +- code/lib/source-loader/package.json | 2 +- code/yarn.lock | 15 +++------------ scripts/package.json | 2 +- scripts/yarn.lock | 10 +++++----- 5 files changed, 11 insertions(+), 20 deletions(-) diff --git a/code/lib/codemod/package.json b/code/lib/codemod/package.json index dec7f71fbdeb..fc3e6aec3344 100644 --- a/code/lib/codemod/package.json +++ b/code/lib/codemod/package.json @@ -46,7 +46,7 @@ "globby": "^11.0.2", "jscodeshift": "^0.13.1", "lodash": "^4.17.21", - "prettier": ">=2.2.1 <=2.3.0", + "prettier": ">=2.2.1 <=3.0.0", "recast": "^0.19.0", "util": "^0.12.4" }, diff --git a/code/lib/source-loader/package.json b/code/lib/source-loader/package.json index f29407d09a05..deb1de5902c6 100644 --- a/code/lib/source-loader/package.json +++ b/code/lib/source-loader/package.json @@ -47,7 +47,7 @@ "@storybook/types": "7.0.0-alpha.45", "estraverse": "^5.2.0", "lodash": "^4.17.21", - "prettier": ">=2.2.1 <=2.3.0" + "prettier": ">=2.2.1 <=3.0.0" }, "devDependencies": { "jest-specific-snapshot": "^4.0.0", diff --git a/code/yarn.lock b/code/yarn.lock index 363d89520afe..dd01e87ce605 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6415,7 +6415,7 @@ __metadata: jest-specific-snapshot: ^4.0.0 jscodeshift: ^0.13.1 lodash: ^4.17.21 - prettier: ">=2.2.1 <=2.3.0" + prettier: ">=2.2.1 <=3.0.0" recast: ^0.19.0 typescript: ~4.6.3 util: ^0.12.4 @@ -7699,7 +7699,7 @@ __metadata: estraverse: ^5.2.0 jest-specific-snapshot: ^4.0.0 lodash: ^4.17.21 - prettier: ">=2.2.1 <=2.3.0" + prettier: ">=2.2.1 <=3.0.0" typescript: ~4.6.3 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -28639,7 +28639,7 @@ __metadata: languageName: node linkType: hard -"prettier@npm:2.7.1, prettier@npm:>=2.5, prettier@npm:^1.18.2 || ^2.0.0": +"prettier@npm:2.7.1, prettier@npm:>=2.2.1 <=3.0.0, prettier@npm:>=2.5, prettier@npm:^1.18.2 || ^2.0.0": version: 2.7.1 resolution: "prettier@npm:2.7.1" bin: @@ -28648,15 +28648,6 @@ __metadata: languageName: node linkType: hard -"prettier@npm:>=2.2.1 <=2.3.0": - version: 2.3.0 - resolution: "prettier@npm:2.3.0" - bin: - prettier: bin-prettier.js - checksum: b9f434af2f25a37aad0b133894827e980885eb8bf317444c9dde0401ed2c7f463f9996d691f5ee5a0a4450ab46a894cd6557516b561e2522821522ce1f4c6668 - languageName: node - linkType: hard - "pretty-bytes@npm:^5.3.0": version: 5.6.0 resolution: "pretty-bytes@npm:5.6.0" diff --git a/scripts/package.json b/scripts/package.json index 48f8a8646bd9..e7190c1c757e 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -147,7 +147,7 @@ "npmlog": "^5.0.1", "nx": "14.6.1", "p-limit": "^3.1.0", - "prettier": ">=2.2.1 <=2.3.0", + "prettier": ">=2.2.1 <=3.0.0", "pretty-hrtime": "^1.0.0", "process": "^0.11.10", "prompts": "^2.4.0", diff --git a/scripts/yarn.lock b/scripts/yarn.lock index d55dc7d41ec1..fb167307ddc9 100644 --- a/scripts/yarn.lock +++ b/scripts/yarn.lock @@ -3431,7 +3431,7 @@ __metadata: npmlog: ^5.0.1 nx: 14.6.1 p-limit: ^3.1.0 - prettier: ">=2.2.1 <=2.3.0" + prettier: ">=2.2.1 <=3.0.0" pretty-hrtime: ^1.0.0 process: ^0.11.10 prompts: ^2.4.0 @@ -15669,12 +15669,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:>=2.2.1 <=2.3.0": - version: 2.3.0 - resolution: "prettier@npm:2.3.0" +"prettier@npm:>=2.2.1 <=3.0.0": + version: 2.7.1 + resolution: "prettier@npm:2.7.1" bin: prettier: bin-prettier.js - checksum: b9f434af2f25a37aad0b133894827e980885eb8bf317444c9dde0401ed2c7f463f9996d691f5ee5a0a4450ab46a894cd6557516b561e2522821522ce1f4c6668 + checksum: 359d2b7ecf36bd52924a48331cae506d335f18637fde6c686212f952b9ce678ce9f554a80571049b36ec2897a8a6c40094b776dea371cc5c04c481cf5b78504b languageName: node linkType: hard From 4368b1569df0f2b296189ad5f3f8add9522d4ddd Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Fri, 28 Oct 2022 09:10:49 -0400 Subject: [PATCH 4/5] Make prettier a dependency of @storybook/components --- code/ui/components/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ui/components/package.json b/code/ui/components/package.json index 4291f4db7795..e75af8645fc5 100644 --- a/code/ui/components/package.json +++ b/code/ui/components/package.json @@ -56,6 +56,7 @@ "@storybook/theming": "7.0.0-alpha.45", "@storybook/types": "7.0.0-alpha.45", "memoizerific": "^1.11.3", + "prettier": ">=2.5", "util-deprecate": "^1.0.2" }, "devDependencies": { @@ -67,7 +68,6 @@ "global": "^4.4.0", "overlayscrollbars": "^1.13.1", "polished": "^4.2.2", - "prettier": ">=2.5", "react-popper-tooltip": "^3.1.1", "react-syntax-highlighter": "^15.4.5", "react-textarea-autosize": "^8.3.0", From 3488284643af536095be2b9c72080c74e3bf5aac Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Mon, 31 Oct 2022 11:50:22 -0400 Subject: [PATCH 5/5] Restore prettier to devDependencies, so it is bundled --- code/ui/components/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/ui/components/package.json b/code/ui/components/package.json index e75af8645fc5..4291f4db7795 100644 --- a/code/ui/components/package.json +++ b/code/ui/components/package.json @@ -56,7 +56,6 @@ "@storybook/theming": "7.0.0-alpha.45", "@storybook/types": "7.0.0-alpha.45", "memoizerific": "^1.11.3", - "prettier": ">=2.5", "util-deprecate": "^1.0.2" }, "devDependencies": { @@ -68,6 +67,7 @@ "global": "^4.4.0", "overlayscrollbars": "^1.13.1", "polished": "^4.2.2", + "prettier": ">=2.5", "react-popper-tooltip": "^3.1.1", "react-syntax-highlighter": "^15.4.5", "react-textarea-autosize": "^8.3.0",