diff --git a/package-lock.json b/package-lock.json index 6a107e1..01ab95f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,11 +34,11 @@ "marko": "^5.31.18", "postcss": "^8.4.35", "postcss-import": "^16.0.1", - "prettier": "^3.2", + "prettier": "^3.6", "prettier-plugin-astro": "^0.12.2", "prettier-plugin-css-order": "^2.0.0", "prettier-plugin-import-sort": "^0.0.7", - "prettier-plugin-jsdoc": "^1.0.1", + "prettier-plugin-jsdoc": "^1.3.3", "prettier-plugin-marko": "^3.1.1", "prettier-plugin-multiline-arrays": "^3.0.6", "prettier-plugin-organize-attributes": "^1.0.0", @@ -5954,10 +5954,11 @@ "dev": true }, "node_modules/prettier": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", - "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz", + "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==", "dev": true, + "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" }, @@ -6015,10 +6016,11 @@ } }, "node_modules/prettier-plugin-jsdoc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/prettier-plugin-jsdoc/-/prettier-plugin-jsdoc-1.3.0.tgz", - "integrity": "sha512-cQm8xIa0fN9ieJFMXACQd6JPycl+8ouOijAqUqu44EF/s4fXL3Wi9sKXuEaodsEWgCN42Xby/bNhqgM1iWx4uw==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/prettier-plugin-jsdoc/-/prettier-plugin-jsdoc-1.3.3.tgz", + "integrity": "sha512-YIxejcbPYK4N58jHGiXjYvrCzBMyvV2AEMSoF5LvqqeMEI0nsmww57I6NGnpVc0AU9ncFCTEBoYHN/xuBf80YA==", "dev": true, + "license": "MIT", "dependencies": { "binary-searching": "^2.0.5", "comment-parser": "^1.4.0", diff --git a/package.json b/package.json index 1101703..d96e95a 100644 --- a/package.json +++ b/package.json @@ -58,11 +58,11 @@ "marko": "^5.31.18", "postcss": "^8.4.35", "postcss-import": "^16.0.1", - "prettier": "^3.2", + "prettier": "^3.6", "prettier-plugin-astro": "^0.12.2", "prettier-plugin-css-order": "^2.0.0", "prettier-plugin-import-sort": "^0.0.7", - "prettier-plugin-jsdoc": "^1.0.1", + "prettier-plugin-jsdoc": "^1.3.3", "prettier-plugin-marko": "^3.1.1", "prettier-plugin-multiline-arrays": "^3.0.6", "prettier-plugin-organize-attributes": "^1.0.0", diff --git a/src/plugins.ts b/src/plugins.ts index 7aa1a10..1472545 100644 --- a/src/plugins.ts +++ b/src/plugins.ts @@ -49,6 +49,13 @@ export async function loadPlugins() { let path = maybeResolve(name) for (let plugin of options.plugins) { + if (plugin instanceof URL) { + if (plugin.protocol !== 'file:') continue + if (plugin.hostname !== '') continue + + plugin = plugin.pathname + } + if (typeof plugin === 'string') { if (plugin === name || plugin === path) { return mod diff --git a/tests/tests.ts b/tests/tests.ts index f324b9d..ad7a60b 100644 --- a/tests/tests.ts +++ b/tests/tests.ts @@ -239,8 +239,7 @@ export let tests: Record = { // TODO: Enable this test — it causes console noise but not a failure // t`
`, - // TODO: Enable test once we can run all tests against Prettier v3.6 - // t`
`, + t`
`, ], css: [...css, t`@apply ${yes} !important;`], scss: [