Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dependencies: Bump prettier dependency, cleanup config #19672

Merged
merged 6 commits into from Nov 2, 2022
Merged

Dependencies: Bump prettier dependency, cleanup config #19672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ed707f
Remove .prettierrc files
IanVS Oct 28, 2022
d99ed8a
Remove html parser override
IanVS Oct 28, 2022
40381d2
Allow up to prettier 3
IanVS Oct 28, 2022
4368b15
Make prettier a dependency of @storybook/components
IanVS Oct 28, 2022
3488284
Restore prettier to devDependencies, so it is bundled
IanVS Oct 31, 2022
b37061c
Merge remote-tracking branch 'origin/next' into prettier-upgrade
IanVS Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 0 additions & 8 deletions code/.prettierrc
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion code/lib/codemod/package.json
View file
Open in desktop
Expand Up @@ -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",
ndelangen marked this conversation as resolved.
Show resolved Hide resolved
"recast": "^0.19.0",
"util": "^0.12.4"
},
Expand Down
2 changes: 1 addition & 1 deletion code/lib/source-loader/package.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down
15 changes: 3 additions & 12 deletions code/yarn.lock
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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"
Expand Down
8 changes: 0 additions & 8 deletions scripts/.prettierrc
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/package.json
View file
Open in desktop
Expand Up @@ -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",
Expand Down
6 changes: 0 additions & 6 deletions scripts/prettier.config.js
View file
Open in desktop
Expand Up @@ -3,10 +3,4 @@ const base = require('@storybook/linter-config/prettier.config');
module.exports = {
...base,
arrowParens: 'always',
overrides: [
{
files: '*.html',
options: { parser: 'babel' },
},
],
};
10 changes: 5 additions & 5 deletions scripts/yarn.lock
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down