diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f6a0d44226a..d94500d2a0f 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -9,7 +9,7 @@ // Add the IDs of extensions you want installed when the container is created. "extensions": [ "dbaeumer.vscode-eslint", - "esbenp.prettier-vscode", + "prettier.prettier-vscode", "streetsidesoftware.code-spell-checker", "vitest.explorer" ] diff --git a/.vscode/extensions.json b/.vscode/extensions.json index feb88bb966e..b26ab98a691 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,7 +1,7 @@ { "recommendations": [ "dbaeumer.vscode-eslint", - "esbenp.prettier-vscode", + "prettier.prettier-vscode", "streetsidesoftware.code-spell-checker", "astro-build.astro-vscode", "vitest.explorer", diff --git a/.vscode/settings.json b/.vscode/settings.json index 61abbfa9412..4c84ae156be 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -27,7 +27,7 @@ "editor.insertSpaces": true, "editor.tabSize": 2, "editor.detectIndentation": false, - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "prettier.prettier-vscode" }, "[json][[jsonc][yaml][typespec][markdown][css][astro][mdx][shellscript][dockerfile]": { "editor.formatOnSave": true, @@ -35,7 +35,7 @@ "editor.insertSpaces": true, "editor.tabSize": 2, "editor.detectIndentation": false, - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "prettier.prettier-vscode" }, "[csharp]": { "editor.insertSpaces": true, diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 043ecfc7ffa..1f7c8e4c8b2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -70,7 +70,7 @@ TYPESPEC_VERBOSE_TEST_OUTPUT=true. ### Recommended extensions 1. [Vitest Test Explorer](https://marketplace.visualstudio.com/items?itemName=vitest.explorer): Run tests from the IDE. -2. [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode): Automatically keep code formatted correctly on save. +2. [Prettier](https://marketplace.visualstudio.com/items?itemName=prettier.prettier-vscode): Automatically keep code formatted correctly on save. 3. [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint): Show eslint errors in warnings in UI. 4. [Code Spell Checker](https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker): Show spell check errors in document. diff --git a/package.json b/package.json index 96d74a57360..a161c0ed0bb 100644 --- a/package.json +++ b/package.json @@ -61,10 +61,10 @@ "micromatch": "^4.0.8", "picocolors": "~1.1.1", "playwright": "^1.51.1", - "prettier": "~3.6.2", + "prettier": "~3.7.4", "prettier-plugin-astro": "^0.14.1", "prettier-plugin-organize-imports": "~4.3.0", - "prettier-plugin-sh": "^0.17.4", + "prettier-plugin-sh": "^0.18.0", "rimraf": "~6.1.2", "syncpack": "^13.0.3", "tsx": "^4.19.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 78d229980d2..3ab29997928 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -76,17 +76,17 @@ importers: specifier: ^1.51.1 version: 1.56.1 prettier: - specifier: ~3.6.2 - version: 3.6.2 + specifier: ~3.7.4 + version: 3.7.4 prettier-plugin-astro: specifier: ^0.14.1 version: 0.14.1 prettier-plugin-organize-imports: specifier: ~4.3.0 - version: 4.3.0(prettier@3.6.2)(typescript@5.9.3) + version: 4.3.0(prettier@3.7.4)(typescript@5.9.3) prettier-plugin-sh: - specifier: ^0.17.4 - version: 0.17.4(prettier@3.6.2) + specifier: ^0.18.0 + version: 0.18.0(prettier@3.7.4) rimraf: specifier: ~6.1.2 version: 6.1.2 @@ -145,7 +145,7 @@ importers: dependencies: '@astrojs/check': specifier: ^0.9.4 - version: 0.9.5(prettier-plugin-astro@0.14.1)(prettier@3.6.2)(typescript@5.9.3) + version: 0.9.5(prettier-plugin-astro@0.14.1)(prettier@3.7.4)(typescript@5.9.3) '@astrojs/starlight': specifier: ^0.37.0 version: 0.37.0(astro@5.16.4(@azure/identity@4.13.0)(@azure/storage-blob@12.29.1)(@types/node@24.10.1)(rollup@4.49.0)(tsx@4.20.6)(typescript@5.9.3)(yaml@2.8.1)) @@ -2508,7 +2508,7 @@ importers: dependencies: '@astrojs/check': specifier: ^0.9.4 - version: 0.9.5(prettier-plugin-astro@0.14.1)(prettier@3.6.2)(typescript@5.9.3) + version: 0.9.5(prettier-plugin-astro@0.14.1)(prettier@3.7.4)(typescript@5.9.3) '@astrojs/react': specifier: ^4.4.2 version: 4.4.2(@types/node@24.10.1)(@types/react-dom@19.2.3(@types/react@19.2.6))(@types/react@19.2.6)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(tsx@4.20.6)(yaml@2.8.1) @@ -11296,17 +11296,22 @@ packages: vue-tsc: optional: true - prettier-plugin-sh@0.17.4: - resolution: {integrity: sha512-aAVKXZ7GTEMZdZsIPSwMwddwPvt2ibMbRGd4OJAP0G7QoeYZV+mPNg2Oln3R53sZ4PVjeAA7Xzi/PuI0QlHHfQ==} + prettier-plugin-sh@0.18.0: + resolution: {integrity: sha512-cW1XL27FOJQ/qGHOW6IHwdCiNWQsAgK+feA8V6+xUTaH0cD3Mh+tFAtBvEEWvuY6hTDzRV943Fzeii+qMOh7nQ==} engines: {node: '>=16.0.0'} peerDependencies: - prettier: ^3.0.3 + prettier: ^3.6.0 prettier@3.6.2: resolution: {integrity: sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==} engines: {node: '>=14'} hasBin: true + prettier@3.7.4: + resolution: {integrity: sha512-v6UNi1+3hSlVvv8fSaoUbggEM5VErKmmpGA7Pl3HF8V6uKY7rvClBOJlH6yNwQtfTueNkGVpOv/mtWL9L4bgRA==} + engines: {node: '>=14'} + hasBin: true + pretty-bytes@5.6.0: resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==} engines: {node: '>=6'} @@ -13819,9 +13824,9 @@ snapshots: '@csstools/css-tokenizer': 3.0.4 lru-cache: 10.4.3 - '@astrojs/check@0.9.5(prettier-plugin-astro@0.14.1)(prettier@3.6.2)(typescript@5.9.3)': + '@astrojs/check@0.9.5(prettier-plugin-astro@0.14.1)(prettier@3.7.4)(typescript@5.9.3)': dependencies: - '@astrojs/language-server': 2.16.0(prettier-plugin-astro@0.14.1)(prettier@3.6.2)(typescript@5.9.3) + '@astrojs/language-server': 2.16.0(prettier-plugin-astro@0.14.1)(prettier@3.7.4)(typescript@5.9.3) chokidar: 4.0.3 kleur: 4.1.5 typescript: 5.9.3 @@ -13834,7 +13839,7 @@ snapshots: '@astrojs/internal-helpers@0.7.5': {} - '@astrojs/language-server@2.16.0(prettier-plugin-astro@0.14.1)(prettier@3.6.2)(typescript@5.9.3)': + '@astrojs/language-server@2.16.0(prettier-plugin-astro@0.14.1)(prettier@3.7.4)(typescript@5.9.3)': dependencies: '@astrojs/compiler': 2.13.0 '@astrojs/yaml2ts': 0.2.2 @@ -13848,14 +13853,14 @@ snapshots: volar-service-css: 0.0.66(@volar/language-service@2.4.23) volar-service-emmet: 0.0.66(@volar/language-service@2.4.23) volar-service-html: 0.0.66(@volar/language-service@2.4.23) - volar-service-prettier: 0.0.66(@volar/language-service@2.4.23)(prettier@3.6.2) + volar-service-prettier: 0.0.66(@volar/language-service@2.4.23)(prettier@3.7.4) volar-service-typescript: 0.0.66(@volar/language-service@2.4.23) volar-service-typescript-twoslash-queries: 0.0.66(@volar/language-service@2.4.23) volar-service-yaml: 0.0.66(@volar/language-service@2.4.23) vscode-html-languageservice: 5.6.0 vscode-uri: 3.1.0 optionalDependencies: - prettier: 3.6.2 + prettier: 3.7.4 prettier-plugin-astro: 0.14.1 transitivePeerDependencies: - typescript @@ -25318,22 +25323,24 @@ snapshots: prettier-plugin-astro@0.14.1: dependencies: '@astrojs/compiler': 2.13.0 - prettier: 3.6.2 + prettier: 3.7.4 sass-formatter: 0.7.9 - prettier-plugin-organize-imports@4.3.0(prettier@3.6.2)(typescript@5.9.3): + prettier-plugin-organize-imports@4.3.0(prettier@3.7.4)(typescript@5.9.3): dependencies: - prettier: 3.6.2 + prettier: 3.7.4 typescript: 5.9.3 - prettier-plugin-sh@0.17.4(prettier@3.6.2): + prettier-plugin-sh@0.18.0(prettier@3.7.4): dependencies: '@reteps/dockerfmt': 0.3.6 - prettier: 3.6.2 + prettier: 3.7.4 sh-syntax: 0.5.8 prettier@3.6.2: {} + prettier@3.7.4: {} + pretty-bytes@5.6.0: {} pretty-format@27.5.1: @@ -27475,12 +27482,12 @@ snapshots: optionalDependencies: '@volar/language-service': 2.4.23 - volar-service-prettier@0.0.66(@volar/language-service@2.4.23)(prettier@3.6.2): + volar-service-prettier@0.0.66(@volar/language-service@2.4.23)(prettier@3.7.4): dependencies: vscode-uri: 3.1.0 optionalDependencies: '@volar/language-service': 2.4.23 - prettier: 3.6.2 + prettier: 3.7.4 volar-service-typescript-twoslash-queries@0.0.66(@volar/language-service@2.4.23): dependencies: