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/code/lib/codemod/package.json b/code/lib/codemod/package.json index 7230ab027c89..3d9a473cd683 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 0e64cbdd9a38..9eef875da2f5 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.47", "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 c827df0533da..38af9d7e00c3 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6428,7 +6428,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 @@ -7724,7 +7724,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 @@ -28674,7 +28674,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: @@ -28683,15 +28683,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/.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" -} 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/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' }, - }, - ], }; 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