diff --git a/.changeset/shiny-bears-turn.md b/.changeset/shiny-bears-turn.md new file mode 100644 index 00000000..84a93cb1 --- /dev/null +++ b/.changeset/shiny-bears-turn.md @@ -0,0 +1,5 @@ +--- +"eslint-plugin-prettier": patch +--- + +fix: use `prettierRcOptions` directly for prettier 3.6+ diff --git a/.prettierrc b/.prettierrc index c45c122f..9bf67b5d 100644 --- a/.prettierrc +++ b/.prettierrc @@ -3,7 +3,6 @@ "singleQuote": true, "plugins": [ "@prettier/plugin-pug", - "prettier-plugin-jsdoc", "prettier-plugin-pkg", "prettier-plugin-svelte" ], diff --git a/README.md b/README.md index a93d6b0e..6bc12623 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,6 @@ If you’re fixing large of amounts of previously unformatted code, consider tem > Note: While it is possible to pass options to Prettier via your ESLint configuration file, it is not recommended because editor extensions such as `prettier-atom` and `prettier-vscode` **will** read [`.prettierrc`](https://prettier.io/docs/en/configuration.html), but **won't** read settings from ESLint, which can lead to an inconsistent experience. - The first option: - - An object representing [options](https://prettier.io/docs/en/options.html) that will be passed into prettier. Example: ```json @@ -140,9 +139,7 @@ If you’re fixing large of amounts of previously unformatted code, consider tem NB: This option will merge and override any config set with `.prettierrc` files - The second option: - - An object with the following options - - `usePrettierrc`: Enables loading of the Prettier configuration file, (default: `true`). May be useful if you are using multiple tools that conflict with each other, or do not wish to mix your ESLint settings with your Prettier configuration. And also, it is possible to run prettier without loading the prettierrc config file [via the CLI's --no-config option](https://prettier.io/docs/en/cli.html#--no-config) or through the API by [calling prettier.format() without passing through the options generated by calling resolveConfig](https://prettier.io/docs/en/api.html#prettierresolveconfigfilepath--options). ```json diff --git a/package.json b/package.json index 8510b2bb..81608db1 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,6 @@ "lint-staged": "^16.0.0", "mocha": "^11.1.0", "prettier": "^3.5.3", - "prettier-plugin-jsdoc": "^1.3.2", "prettier-plugin-pkg": "^0.21.0", "prettier-plugin-svelte": "^3.3.3", "simple-git-hooks": "^2.12.1", @@ -105,7 +104,7 @@ "unified-engine@11.2.2": "patches/unified-engine@11.2.2.patch" }, "overrides": { - "prettier": "^3.5.3" + "prettier": "^3.6.1" } } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d1845a4a..b2ea486f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,7 +1,7 @@ lockfileVersion: 5.4 overrides: - prettier: ^3.5.3 + prettier: ^3.6.1 patchedDependencies: unified-engine@11.2.2: @@ -34,9 +34,8 @@ specifiers: graphql: ^16.10.0 lint-staged: ^16.0.0 mocha: ^11.1.0 - prettier: ^3.5.3 + prettier: ^3.6.1 prettier-linter-helpers: ^1.0.0 - prettier-plugin-jsdoc: ^1.3.2 prettier-plugin-pkg: ^0.21.0 prettier-plugin-svelte: ^3.3.3 simple-git-hooks: ^2.12.1 @@ -49,7 +48,7 @@ dependencies: synckit: 0.11.7 devDependencies: - '@1stg/remark-preset': 3.0.1_prettier@3.5.3 + '@1stg/remark-preset': 3.0.1_prettier@3.6.1 '@changesets/changelog-github': 0.5.1 '@changesets/cli': 2.28.1 '@commitlint/cli': 19.8.0 @@ -59,7 +58,7 @@ devDependencies: '@eslint/json': 0.12.0 '@graphql-eslint/eslint-plugin': 4.3.0_garjxkg63rquziivo3mxre4wya '@html-eslint/parser': 0.41.0 - '@prettier/plugin-pug': 3.2.1_prettier@3.5.3 + '@prettier/plugin-pug': 3.2.1_prettier@3.6.1 '@types/prettier-linter-helpers': 1.0.4 clean-pkg-json: 1.2.1 eslint: 9.23.0 @@ -74,17 +73,16 @@ devDependencies: graphql: 16.10.0 lint-staged: 16.1.0 mocha: 11.1.0 - prettier: 3.5.3 - prettier-plugin-jsdoc: 1.3.2_prettier@3.5.3 - prettier-plugin-pkg: 0.21.1_prettier@3.5.3 - prettier-plugin-svelte: 3.3.3_2ymjksukde6plevbhihn5hqk44 + prettier: 3.6.1 + prettier-plugin-pkg: 0.21.1_prettier@3.6.1 + prettier-plugin-svelte: 3.3.3_jh7atynzrv636i3i2ulv7w6yxy simple-git-hooks: 2.12.1 svelte: 5.25.3 vue-eslint-parser: 10.1.1_eslint@9.23.0 packages: - /@1stg/remark-preset/3.0.1_prettier@3.5.3: + /@1stg/remark-preset/3.0.1_prettier@3.6.1: resolution: {integrity: sha512-CaEEZhDe6DdVBklK5LKInxnmpH803COKqawwviDfS31O7HSBJsyfRMzkPPG7o0rQnVS9ShsTZOYFiYDRskttVw==} engines: {node: '>=16.0.0'} dependencies: @@ -96,7 +94,7 @@ packages: remark-preset-lint-consistent: 6.0.1 remark-preset-lint-markdown-style-guide: 6.0.1 remark-preset-lint-recommended: 7.0.1 - remark-preset-prettier: 2.0.1_prettier@3.5.3 + remark-preset-prettier: 2.0.1_prettier@3.6.1 remark-validate-links: 13.1.0 transitivePeerDependencies: - bluebird @@ -293,7 +291,7 @@ packages: fs-extra: 7.0.1 lodash.startcase: 4.4.0 outdent: 0.5.0 - prettier: 3.5.3 + prettier: 3.6.1 resolve-from: 5.0.0 semver: 7.7.1 dev: true @@ -475,7 +473,7 @@ packages: '@changesets/types': 6.1.0 fs-extra: 7.0.1 human-id: 4.1.1 - prettier: 3.5.3 + prettier: 3.6.1 dev: true /@commitlint/cli/19.8.0: @@ -1295,13 +1293,13 @@ packages: engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} dev: false - /@prettier/plugin-pug/3.2.1_prettier@3.5.3: + /@prettier/plugin-pug/3.2.1_prettier@3.6.1: resolution: {integrity: sha512-JvcW+44DtpnVsQFu++vBHl2fGVsuZC8iyxwutEUOt94thksdmXYQp1jFZWzaXckkwqLSgJHSyu19i1qvag5GJQ==} engines: {node: '>=18.0.0', npm: '>=9.0.0'} peerDependencies: prettier: ^3.0.0 dependencies: - prettier: 3.5.3 + prettier: 3.6.1 pug-lexer: 5.0.1 dev: true @@ -1595,10 +1593,6 @@ packages: engines: {node: '>=8'} dev: true - /binary-searching/2.0.5: - resolution: {integrity: sha512-v4N2l3RxL+m4zDxyxz3Ne2aTmiPn8ZUpKFpdPtO+ItW1NcTCXA7JeHG5GMBSvoKSkQZ9ycS+EouDVxYB9ufKWA==} - dev: true - /brace-expansion/1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} dependencies: @@ -1801,11 +1795,6 @@ packages: engines: {node: '>=20'} dev: true - /comment-parser/1.4.1: - resolution: {integrity: sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==} - engines: {node: '>= 12.0.0'} - dev: true - /compare-func/2.0.0: resolution: {integrity: sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==} dependencies: @@ -4351,41 +4340,27 @@ packages: fast-diff: 1.3.0 dev: false - /prettier-plugin-jsdoc/1.3.2_prettier@3.5.3: - resolution: {integrity: sha512-LNi9eq0TjyZn/PUNf/SYQxxUvGg5FLK4alEbi3i/S+2JbMyTu790c/puFueXzx09KP44oWCJ+TaHRyM/a0rKJQ==} - engines: {node: '>=14.13.1 || >=16.0.0'} - peerDependencies: - prettier: ^3.0.0 - dependencies: - binary-searching: 2.0.5 - comment-parser: 1.4.1 - mdast-util-from-markdown: 2.0.2 - prettier: 3.5.3 - transitivePeerDependencies: - - supports-color - dev: true - - /prettier-plugin-pkg/0.21.1_prettier@3.5.3: + /prettier-plugin-pkg/0.21.1_prettier@3.6.1: resolution: {integrity: sha512-f9qlj08joTh+x4UAQvL0UdhLf+LyJyBN9CBEnH7Ip1hitcc52vfkZEH5I7PsRFyDu/bm4d94GaJ7mfeLmFEsfg==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: prettier: ^3.0.3 dependencies: - prettier: 3.5.3 + prettier: 3.6.1 dev: true - /prettier-plugin-svelte/3.3.3_2ymjksukde6plevbhihn5hqk44: + /prettier-plugin-svelte/3.3.3_jh7atynzrv636i3i2ulv7w6yxy: resolution: {integrity: sha512-yViK9zqQ+H2qZD1w/bH7W8i+bVfKrD8GIFjkFe4Thl6kCT9SlAsXVNmt3jCvQOCsnOhcvYgsoVlRV/Eu6x5nNw==} peerDependencies: prettier: ^3.0.0 svelte: ^3.2.0 || ^4.0.0-next.0 || ^5.0.0-next.0 dependencies: - prettier: 3.5.3 + prettier: 3.6.1 svelte: 5.25.3 dev: true - /prettier/3.5.3: - resolution: {integrity: sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==} + /prettier/3.6.1: + resolution: {integrity: sha512-5xGWRa90Sp2+x1dQtNpIpeOQpTDBs9cZDmA/qs2vDNN2i18PdapqY7CmBeyLlMuGqXJRIOPaCaVZTLNQRWUH/A==} engines: {node: '>=14'} hasBin: true dev: true @@ -5210,13 +5185,13 @@ packages: - supports-color dev: true - /remark-preset-prettier/2.0.1_prettier@3.5.3: + /remark-preset-prettier/2.0.1_prettier@3.6.1: resolution: {integrity: sha512-1+cZaM080zTlhQIvZDOj7SFWvW9zevfxsLjTZspLEsBYivMDwCyTodvNvaZLc9p5dUSMik/BjMFKicfhZXh7qg==} engines: {node: '>=14.8'} peerDependencies: prettier: '>=1.0.0' dependencies: - prettier: 3.5.3 + prettier: 3.6.1 dev: true /remark-stringify/11.0.0: diff --git a/worker.mjs b/worker.mjs index b76274ce..e0238122 100644 --- a/worker.mjs +++ b/worker.mjs @@ -45,9 +45,7 @@ runAsWorker( resolveConfig: false, withNodeModules: false, ignorePath: '.prettierignore', - plugins: /** @type {string[] | undefined} */ ( - prettierRcOptions ? prettierRcOptions.plugins : undefined - ), + ...prettierRcOptions, ...eslintFileInfoOptions, }, );