Skip to content

Commit

Permalink
Prettier update (#6777)
Browse files Browse the repository at this point in the history
  • Loading branch information
sneridagh authored Feb 22, 2025
1 parent 2cdfd01 commit 7e69296
Show file tree
Hide file tree
Showing 14 changed files with 337 additions and 863 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/cookieplone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,14 @@ jobs:
working-directory: seven-add-on
run: pnpm lint

- name: Run Prettier in the generated package
working-directory: seven-add-on
run: pnpm prettier

- name: Run Stylelint in the generated package
working-directory: seven-add-on
run: pnpm stylelint

- name: Cypress acceptance tests
uses: cypress-io/github-action@v6
env:
Expand Down
1 change: 1 addition & 0 deletions .stylelintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ docs
node_modules
packages/registry/lib
build
packages/volto*
1 change: 1 addition & 0 deletions apps/seven/news/6777.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update `prettier` and `stylelint` to latest. @sneridagh
4 changes: 0 additions & 4 deletions apps/seven/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,7 @@
"cypress": "^13.13.2",
"cypress-axe": "1.5.0",
"cypress-file-upload": "5.0.8",
"prettier": "^3.5.1",
"react-router-devtools": "^1.1.0",
"stylelint": "^16.3.1",
"stylelint-config-idiomatic-order": "10.0.0",
"stylelint-prettier": "5.0.0",
"typescript": "catalog:",
"vite": "catalog:",
"vite-tsconfig-paths": "^5.0.1",
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@
"husky": "^9.0.11",
"lint-staged": "^15.2.2",
"tsconfig": "workspace:*",
"typescript": "^5.7.3",
"vitest": "^2.1.3"
"typescript": "^5.7.3"
},
"packageManager": "[email protected]",
"pnpm": {
Expand Down
1 change: 1 addition & 0 deletions packages/client/news/6777.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update vitest packages to match the catalog. @sneridagh
6 changes: 3 additions & 3 deletions packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"version": "1.0.0-alpha.23",
"repository": {
"type": "git",
"url": "[email protected]:plone/volto.git"
"url": "[email protected]:plone/volto.git",
"directory": "packages/client"
},
"bugs": {
"url": "https://github.com/plone/volto/issues"
Expand Down Expand Up @@ -72,8 +73,7 @@
"@types/react-dom": "catalog:",
"@types/uuid": "^9.0.2",
"@vitejs/plugin-react": "^4.1.0",
"@vitest/coverage-v8": "^1.3.1",
"glob": "7.1.6",
"@vitest/coverage-v8": "catalog:",
"jsdom": "^21.1.1",
"release-it": "catalog:",
"tsup": "^8.3.5",
Expand Down
1 change: 1 addition & 0 deletions packages/components/news/6777.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update vitest packages to match the catalog. @sneridagh
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
"@vitejs/plugin-react": "^4.1.0",
"@vitest/coverage-v8": "^1.3.1",
"@vitest/coverage-v8": "^2.1.9",
"browserslist": "^4.23.0",
"eslint-plugin-storybook": "^0.11.2",
"jest-axe": "^8.0.0",
Expand Down
1 change: 1 addition & 0 deletions packages/react-router/news/6777.internal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update react-router version to match the catalog one. @sneridagh
2 changes: 1 addition & 1 deletion packages/react-router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"devDependencies": {
"@arethetypeswrong/cli": "^0.16.4",
"@plone/types": "workspace:*",
"@react-router/dev": "7.1.2",
"@react-router/dev": "catalog:",
"@types/node": "22.10.7",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
Expand Down
4 changes: 4 additions & 0 deletions packages/tooling/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
"eslint-plugin-prettier": "^5.2.3",
"eslint-plugin-react": "^7.37.4",
"eslint-plugin-react-hooks": "^5.0.1",
"prettier": "^3.5.2",
"stylelint": "^16.14.1",
"stylelint-config-idiomatic-order": "10.0.0",
"stylelint-prettier": "5.0.3",
"typescript-eslint": "^8.24.1"
}
}
1,161 changes: 310 additions & 851 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ packages:
- 'apps/seven'
# exclude packages that are inside test directories
- '!**/test/**'
# exclude Volto packages, leaving them as reference
- '!packages/volto*'
- '!packages/coresandbox'

catalog:
react: ^19.0.0
Expand All @@ -20,5 +22,6 @@ catalog:
'@tanstack/react-query': ^5.59.0
release-it: ^18.1.2
typescript: ^5.7.3
vitest: ^2.1.3
vitest: ^2.1.9
'@vitest/coverage-v8': ^2.1.9
vite: ^5.4.9

0 comments on commit 7e69296

Please sign in to comment.