diff --git a/.pnp.cjs b/.pnp.cjs index 60ef68b..ed67c8b 100644 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -41,8 +41,7 @@ const RAW_RUNTIME_STATE = ["eslint-plugin-react-refresh", "virtual:bb369ca2963505637dea0649a241a3c280be9828724dc6ca485d2277a1e4836924e10f88a166a9d943006d84cccd7458c7a7bf54835f9ce07262ddc38e98a95f#npm:0.4.5"],\ ["jest", "virtual:bb369ca2963505637dea0649a241a3c280be9828724dc6ca485d2277a1e4836924e10f88a166a9d943006d84cccd7458c7a7bf54835f9ce07262ddc38e98a95f#npm:29.7.0"],\ ["postcss", "npm:8.4.32"],\ - ["prettier", "npm:3.1.1"],\ - ["prettier-plugin-tailwindcss", "virtual:bb369ca2963505637dea0649a241a3c280be9828724dc6ca485d2277a1e4836924e10f88a166a9d943006d84cccd7458c7a7bf54835f9ce07262ddc38e98a95f#npm:0.5.9"],\ + ["prettier", "npm:3.3.2"],\ ["react", "npm:18.2.0"],\ ["react-dom", "virtual:bb369ca2963505637dea0649a241a3c280be9828724dc6ca485d2277a1e4836924e10f88a166a9d943006d84cccd7458c7a7bf54835f9ce07262ddc38e98a95f#npm:18.2.0"],\ ["react-router-dom", "virtual:bb369ca2963505637dea0649a241a3c280be9828724dc6ca485d2277a1e4836924e10f88a166a9d943006d84cccd7458c7a7bf54835f9ce07262ddc38e98a95f#npm:6.21.1"],\ @@ -3514,8 +3513,7 @@ const RAW_RUNTIME_STATE = ["eslint-plugin-react-refresh", "virtual:bb369ca2963505637dea0649a241a3c280be9828724dc6ca485d2277a1e4836924e10f88a166a9d943006d84cccd7458c7a7bf54835f9ce07262ddc38e98a95f#npm:0.4.5"],\ ["jest", "virtual:bb369ca2963505637dea0649a241a3c280be9828724dc6ca485d2277a1e4836924e10f88a166a9d943006d84cccd7458c7a7bf54835f9ce07262ddc38e98a95f#npm:29.7.0"],\ ["postcss", "npm:8.4.32"],\ - ["prettier", "npm:3.1.1"],\ - ["prettier-plugin-tailwindcss", "virtual:bb369ca2963505637dea0649a241a3c280be9828724dc6ca485d2277a1e4836924e10f88a166a9d943006d84cccd7458c7a7bf54835f9ce07262ddc38e98a95f#npm:0.5.9"],\ + ["prettier", "npm:3.3.2"],\ ["react", "npm:18.2.0"],\ ["react-dom", "virtual:bb369ca2963505637dea0649a241a3c280be9828724dc6ca485d2277a1e4836924e10f88a166a9d943006d84cccd7458c7a7bf54835f9ce07262ddc38e98a95f#npm:18.2.0"],\ ["react-router-dom", "virtual:bb369ca2963505637dea0649a241a3c280be9828724dc6ca485d2277a1e4836924e10f88a166a9d943006d84cccd7458c7a7bf54835f9ce07262ddc38e98a95f#npm:6.21.1"],\ @@ -3763,7 +3761,7 @@ const RAW_RUNTIME_STATE = ["@types/prettier", null],\ ["eslint", "npm:8.56.0"],\ ["eslint-config-prettier", "virtual:bb369ca2963505637dea0649a241a3c280be9828724dc6ca485d2277a1e4836924e10f88a166a9d943006d84cccd7458c7a7bf54835f9ce07262ddc38e98a95f#npm:9.1.0"],\ - ["prettier", "npm:3.1.1"],\ + ["prettier", "npm:3.3.2"],\ ["prettier-linter-helpers", "npm:1.0.0"],\ ["synckit", "npm:0.8.8"]\ ],\ @@ -6157,10 +6155,10 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["prettier", [\ - ["npm:3.1.1", {\ - "packageLocation": "./.yarn/unplugged/prettier-npm-3.1.1-072c31ec21/node_modules/prettier/",\ + ["npm:3.3.2", {\ + "packageLocation": "./.yarn/unplugged/prettier-npm-3.3.2-efeafcaa4b/node_modules/prettier/",\ "packageDependencies": [\ - ["prettier", "npm:3.1.1"]\ + ["prettier", "npm:3.3.2"]\ ],\ "linkType": "HARD"\ }]\ @@ -6175,84 +6173,6 @@ const RAW_RUNTIME_STATE = "linkType": "HARD"\ }]\ ]],\ - ["prettier-plugin-tailwindcss", [\ - ["npm:0.5.9", {\ - "packageLocation": "./.yarn/unplugged/prettier-plugin-tailwindcss-virtual-70aacb2371/node_modules/prettier-plugin-tailwindcss/",\ - "packageDependencies": [\ - ["prettier-plugin-tailwindcss", "npm:0.5.9"]\ - ],\ - "linkType": "SOFT"\ - }],\ - ["virtual:bb369ca2963505637dea0649a241a3c280be9828724dc6ca485d2277a1e4836924e10f88a166a9d943006d84cccd7458c7a7bf54835f9ce07262ddc38e98a95f#npm:0.5.9", {\ - "packageLocation": "./.yarn/unplugged/prettier-plugin-tailwindcss-virtual-70aacb2371/node_modules/prettier-plugin-tailwindcss/",\ - "packageDependencies": [\ - ["prettier-plugin-tailwindcss", "virtual:bb369ca2963505637dea0649a241a3c280be9828724dc6ca485d2277a1e4836924e10f88a166a9d943006d84cccd7458c7a7bf54835f9ce07262ddc38e98a95f#npm:0.5.9"],\ - ["@ianvs/prettier-plugin-sort-imports", null],\ - ["@prettier/plugin-pug", null],\ - ["@shopify/prettier-plugin-liquid", null],\ - ["@trivago/prettier-plugin-sort-imports", null],\ - ["@types/ianvs__prettier-plugin-sort-imports", null],\ - ["@types/prettier", null],\ - ["@types/prettier-plugin-astro", null],\ - ["@types/prettier-plugin-css-order", null],\ - ["@types/prettier-plugin-import-sort", null],\ - ["@types/prettier-plugin-jsdoc", null],\ - ["@types/prettier-plugin-marko", null],\ - ["@types/prettier-plugin-organize-attributes", null],\ - ["@types/prettier-plugin-organize-imports", null],\ - ["@types/prettier-plugin-style-order", null],\ - ["@types/prettier-plugin-svelte", null],\ - ["@types/prettier-plugin-twig-melody", null],\ - ["@types/prettier__plugin-pug", null],\ - ["@types/shopify__prettier-plugin-liquid", null],\ - ["@types/trivago__prettier-plugin-sort-imports", null],\ - ["prettier", "npm:3.1.1"],\ - ["prettier-plugin-astro", null],\ - ["prettier-plugin-css-order", null],\ - ["prettier-plugin-import-sort", null],\ - ["prettier-plugin-jsdoc", null],\ - ["prettier-plugin-marko", null],\ - ["prettier-plugin-organize-attributes", null],\ - ["prettier-plugin-organize-imports", null],\ - ["prettier-plugin-style-order", null],\ - ["prettier-plugin-svelte", null],\ - ["prettier-plugin-twig-melody", null]\ - ],\ - "packagePeers": [\ - "@ianvs/prettier-plugin-sort-imports",\ - "@prettier/plugin-pug",\ - "@shopify/prettier-plugin-liquid",\ - "@trivago/prettier-plugin-sort-imports",\ - "@types/ianvs__prettier-plugin-sort-imports",\ - "@types/prettier-plugin-astro",\ - "@types/prettier-plugin-css-order",\ - "@types/prettier-plugin-import-sort",\ - "@types/prettier-plugin-jsdoc",\ - "@types/prettier-plugin-marko",\ - "@types/prettier-plugin-organize-attributes",\ - "@types/prettier-plugin-organize-imports",\ - "@types/prettier-plugin-style-order",\ - "@types/prettier-plugin-svelte",\ - "@types/prettier-plugin-twig-melody",\ - "@types/prettier",\ - "@types/prettier__plugin-pug",\ - "@types/shopify__prettier-plugin-liquid",\ - "@types/trivago__prettier-plugin-sort-imports",\ - "prettier-plugin-astro",\ - "prettier-plugin-css-order",\ - "prettier-plugin-import-sort",\ - "prettier-plugin-jsdoc",\ - "prettier-plugin-marko",\ - "prettier-plugin-organize-attributes",\ - "prettier-plugin-organize-imports",\ - "prettier-plugin-style-order",\ - "prettier-plugin-svelte",\ - "prettier-plugin-twig-melody",\ - "prettier"\ - ],\ - "linkType": "HARD"\ - }]\ - ]],\ ["pretty-format", [\ ["npm:29.7.0", {\ "packageLocation": "./.yarn/cache/pretty-format-npm-29.7.0-7d330b2ea2-dea96bc83c.zip/node_modules/pretty-format/",\ diff --git a/.prettierrc.cjs b/.prettierrc.cjs index 323aa69..42c3d3e 100644 --- a/.prettierrc.cjs +++ b/.prettierrc.cjs @@ -7,7 +7,7 @@ const config = { semi: true, printWidth: 80, tabWidth: 2, - plugins: [require.resolve('prettier-plugin-tailwindcss')], + // plugins: [require.resolve('prettier-plugin-tailwindcss')], }; module.exports = config; diff --git a/.yarn/cache/@esbuild-darwin-arm64-npm-0.19.10-88d2f4ccc1-10.zip b/.yarn/cache/@esbuild-darwin-arm64-npm-0.19.10-88d2f4ccc1-10.zip new file mode 100644 index 0000000..85798a7 Binary files /dev/null and b/.yarn/cache/@esbuild-darwin-arm64-npm-0.19.10-88d2f4ccc1-10.zip differ diff --git a/.yarn/cache/@esbuild-linux-x64-npm-0.19.10-ffa9d18d38-10.zip b/.yarn/cache/@esbuild-linux-x64-npm-0.19.10-ffa9d18d38-10.zip deleted file mode 100644 index b8e52ff..0000000 Binary files a/.yarn/cache/@esbuild-linux-x64-npm-0.19.10-ffa9d18d38-10.zip and /dev/null differ diff --git a/.yarn/cache/@rollup-rollup-darwin-arm64-npm-4.9.1-5c87b1daa4-10.zip b/.yarn/cache/@rollup-rollup-darwin-arm64-npm-4.9.1-5c87b1daa4-10.zip new file mode 100644 index 0000000..c3b3f87 Binary files /dev/null and b/.yarn/cache/@rollup-rollup-darwin-arm64-npm-4.9.1-5c87b1daa4-10.zip differ diff --git a/.yarn/cache/@rollup-rollup-linux-x64-gnu-npm-4.9.1-90827bcce2-10.zip b/.yarn/cache/@rollup-rollup-linux-x64-gnu-npm-4.9.1-90827bcce2-10.zip deleted file mode 100644 index f0d5abf..0000000 Binary files a/.yarn/cache/@rollup-rollup-linux-x64-gnu-npm-4.9.1-90827bcce2-10.zip and /dev/null differ diff --git a/.yarn/cache/@swc-core-linux-x64-gnu-npm-1.3.101-cc4c68d22a-10.zip b/.yarn/cache/@swc-core-darwin-arm64-npm-1.3.101-95a39b9469-10.zip similarity index 56% rename from .yarn/cache/@swc-core-linux-x64-gnu-npm-1.3.101-cc4c68d22a-10.zip rename to .yarn/cache/@swc-core-darwin-arm64-npm-1.3.101-95a39b9469-10.zip index 1b17471..6bf5ef9 100644 Binary files a/.yarn/cache/@swc-core-linux-x64-gnu-npm-1.3.101-cc4c68d22a-10.zip and b/.yarn/cache/@swc-core-darwin-arm64-npm-1.3.101-95a39b9469-10.zip differ diff --git a/.yarn/cache/fsevents-patch-6b67494872-10.zip b/.yarn/cache/fsevents-patch-6b67494872-10.zip new file mode 100644 index 0000000..9887ada Binary files /dev/null and b/.yarn/cache/fsevents-patch-6b67494872-10.zip differ diff --git a/.yarn/cache/prettier-npm-3.1.1-072c31ec21-26a249f321.zip b/.yarn/cache/prettier-npm-3.1.1-072c31ec21-26a249f321.zip deleted file mode 100644 index fb96886..0000000 Binary files a/.yarn/cache/prettier-npm-3.1.1-072c31ec21-26a249f321.zip and /dev/null differ diff --git a/.yarn/cache/prettier-npm-3.3.2-efeafcaa4b-83214e154a.zip b/.yarn/cache/prettier-npm-3.3.2-efeafcaa4b-83214e154a.zip new file mode 100644 index 0000000..3a13cda Binary files /dev/null and b/.yarn/cache/prettier-npm-3.3.2-efeafcaa4b-83214e154a.zip differ diff --git a/.yarn/cache/prettier-plugin-tailwindcss-npm-0.5.9-467e16e035-6450ee245c.zip b/.yarn/cache/prettier-plugin-tailwindcss-npm-0.5.9-467e16e035-6450ee245c.zip deleted file mode 100644 index 36d0404..0000000 Binary files a/.yarn/cache/prettier-plugin-tailwindcss-npm-0.5.9-467e16e035-6450ee245c.zip and /dev/null differ diff --git a/.yarn/sdks/eslint/bin/eslint.js b/.yarn/sdks/eslint/bin/eslint.js index 9ef98e4..42eab99 100755 --- a/.yarn/sdks/eslint/bin/eslint.js +++ b/.yarn/sdks/eslint/bin/eslint.js @@ -1,18 +1,25 @@ #!/usr/bin/env node const {existsSync} = require(`fs`); -const {createRequire} = require(`module`); +const {createRequire, register} = require(`module`); const {resolve} = require(`path`); +const {pathToFileURL} = require(`url`); const relPnpApiPath = "../../../../.pnp.cjs"; const absPnpApiPath = resolve(__dirname, relPnpApiPath); const absRequire = createRequire(absPnpApiPath); +const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); +const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); + if (existsSync(absPnpApiPath)) { if (!process.versions.pnp) { // Setup the environment to be able to require eslint/bin/eslint.js require(absPnpApiPath).setup(); + if (isPnpLoaderEnabled && register) { + register(pathToFileURL(absPnpLoaderPath)); + } } } diff --git a/.yarn/sdks/eslint/lib/api.js b/.yarn/sdks/eslint/lib/api.js index 653b22b..ea2b46a 100644 --- a/.yarn/sdks/eslint/lib/api.js +++ b/.yarn/sdks/eslint/lib/api.js @@ -1,18 +1,25 @@ #!/usr/bin/env node const {existsSync} = require(`fs`); -const {createRequire} = require(`module`); +const {createRequire, register} = require(`module`); const {resolve} = require(`path`); +const {pathToFileURL} = require(`url`); const relPnpApiPath = "../../../../.pnp.cjs"; const absPnpApiPath = resolve(__dirname, relPnpApiPath); const absRequire = createRequire(absPnpApiPath); +const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); +const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); + if (existsSync(absPnpApiPath)) { if (!process.versions.pnp) { // Setup the environment to be able to require eslint require(absPnpApiPath).setup(); + if (isPnpLoaderEnabled && register) { + register(pathToFileURL(absPnpLoaderPath)); + } } } diff --git a/.yarn/sdks/eslint/lib/unsupported-api.js b/.yarn/sdks/eslint/lib/unsupported-api.js index 30fdf15..f5f8e24 100644 --- a/.yarn/sdks/eslint/lib/unsupported-api.js +++ b/.yarn/sdks/eslint/lib/unsupported-api.js @@ -1,18 +1,25 @@ #!/usr/bin/env node const {existsSync} = require(`fs`); -const {createRequire} = require(`module`); +const {createRequire, register} = require(`module`); const {resolve} = require(`path`); +const {pathToFileURL} = require(`url`); const relPnpApiPath = "../../../../.pnp.cjs"; const absPnpApiPath = resolve(__dirname, relPnpApiPath); const absRequire = createRequire(absPnpApiPath); +const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); +const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); + if (existsSync(absPnpApiPath)) { if (!process.versions.pnp) { // Setup the environment to be able to require eslint/use-at-your-own-risk require(absPnpApiPath).setup(); + if (isPnpLoaderEnabled && register) { + register(pathToFileURL(absPnpLoaderPath)); + } } } diff --git a/.yarn/sdks/prettier/bin/prettier.cjs b/.yarn/sdks/prettier/bin/prettier.cjs index 5efad68..00f1f7f 100755 --- a/.yarn/sdks/prettier/bin/prettier.cjs +++ b/.yarn/sdks/prettier/bin/prettier.cjs @@ -1,18 +1,25 @@ #!/usr/bin/env node const {existsSync} = require(`fs`); -const {createRequire} = require(`module`); +const {createRequire, register} = require(`module`); const {resolve} = require(`path`); +const {pathToFileURL} = require(`url`); const relPnpApiPath = "../../../../.pnp.cjs"; const absPnpApiPath = resolve(__dirname, relPnpApiPath); const absRequire = createRequire(absPnpApiPath); +const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); +const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); + if (existsSync(absPnpApiPath)) { if (!process.versions.pnp) { // Setup the environment to be able to require prettier/bin/prettier.cjs require(absPnpApiPath).setup(); + if (isPnpLoaderEnabled && register) { + register(pathToFileURL(absPnpLoaderPath)); + } } } diff --git a/.yarn/sdks/prettier/index.cjs b/.yarn/sdks/prettier/index.cjs index 8758e36..d546c6a 100644 --- a/.yarn/sdks/prettier/index.cjs +++ b/.yarn/sdks/prettier/index.cjs @@ -1,18 +1,25 @@ #!/usr/bin/env node const {existsSync} = require(`fs`); -const {createRequire} = require(`module`); +const {createRequire, register} = require(`module`); const {resolve} = require(`path`); +const {pathToFileURL} = require(`url`); const relPnpApiPath = "../../../.pnp.cjs"; const absPnpApiPath = resolve(__dirname, relPnpApiPath); const absRequire = createRequire(absPnpApiPath); +const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); +const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); + if (existsSync(absPnpApiPath)) { if (!process.versions.pnp) { // Setup the environment to be able to require prettier require(absPnpApiPath).setup(); + if (isPnpLoaderEnabled && register) { + register(pathToFileURL(absPnpLoaderPath)); + } } } diff --git a/.yarn/sdks/prettier/package.json b/.yarn/sdks/prettier/package.json index d2b89e5..b263381 100644 --- a/.yarn/sdks/prettier/package.json +++ b/.yarn/sdks/prettier/package.json @@ -1,6 +1,6 @@ { "name": "prettier", - "version": "3.1.1-sdk", + "version": "3.3.2-sdk", "main": "./index.cjs", "type": "commonjs", "bin": "./bin/prettier.cjs" diff --git a/.yarn/sdks/typescript/bin/tsc b/.yarn/sdks/typescript/bin/tsc index 454b950..a6bb0e2 100755 --- a/.yarn/sdks/typescript/bin/tsc +++ b/.yarn/sdks/typescript/bin/tsc @@ -1,18 +1,25 @@ #!/usr/bin/env node const {existsSync} = require(`fs`); -const {createRequire} = require(`module`); +const {createRequire, register} = require(`module`); const {resolve} = require(`path`); +const {pathToFileURL} = require(`url`); const relPnpApiPath = "../../../../.pnp.cjs"; const absPnpApiPath = resolve(__dirname, relPnpApiPath); const absRequire = createRequire(absPnpApiPath); +const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); +const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); + if (existsSync(absPnpApiPath)) { if (!process.versions.pnp) { // Setup the environment to be able to require typescript/bin/tsc require(absPnpApiPath).setup(); + if (isPnpLoaderEnabled && register) { + register(pathToFileURL(absPnpLoaderPath)); + } } } diff --git a/.yarn/sdks/typescript/bin/tsserver b/.yarn/sdks/typescript/bin/tsserver index d7a6056..957bed2 100755 --- a/.yarn/sdks/typescript/bin/tsserver +++ b/.yarn/sdks/typescript/bin/tsserver @@ -1,18 +1,25 @@ #!/usr/bin/env node const {existsSync} = require(`fs`); -const {createRequire} = require(`module`); +const {createRequire, register} = require(`module`); const {resolve} = require(`path`); +const {pathToFileURL} = require(`url`); const relPnpApiPath = "../../../../.pnp.cjs"; const absPnpApiPath = resolve(__dirname, relPnpApiPath); const absRequire = createRequire(absPnpApiPath); +const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); +const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); + if (existsSync(absPnpApiPath)) { if (!process.versions.pnp) { // Setup the environment to be able to require typescript/bin/tsserver require(absPnpApiPath).setup(); + if (isPnpLoaderEnabled && register) { + register(pathToFileURL(absPnpLoaderPath)); + } } } diff --git a/.yarn/sdks/typescript/lib/tsc.js b/.yarn/sdks/typescript/lib/tsc.js index 2f62fc9..a262a77 100644 --- a/.yarn/sdks/typescript/lib/tsc.js +++ b/.yarn/sdks/typescript/lib/tsc.js @@ -1,18 +1,25 @@ #!/usr/bin/env node const {existsSync} = require(`fs`); -const {createRequire} = require(`module`); +const {createRequire, register} = require(`module`); const {resolve} = require(`path`); +const {pathToFileURL} = require(`url`); const relPnpApiPath = "../../../../.pnp.cjs"; const absPnpApiPath = resolve(__dirname, relPnpApiPath); const absRequire = createRequire(absPnpApiPath); +const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); +const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); + if (existsSync(absPnpApiPath)) { if (!process.versions.pnp) { // Setup the environment to be able to require typescript/lib/tsc.js require(absPnpApiPath).setup(); + if (isPnpLoaderEnabled && register) { + register(pathToFileURL(absPnpLoaderPath)); + } } } diff --git a/.yarn/sdks/typescript/lib/tsserver.js b/.yarn/sdks/typescript/lib/tsserver.js index bbb1e46..1dae54c 100644 --- a/.yarn/sdks/typescript/lib/tsserver.js +++ b/.yarn/sdks/typescript/lib/tsserver.js @@ -1,14 +1,28 @@ #!/usr/bin/env node const {existsSync} = require(`fs`); -const {createRequire} = require(`module`); +const {createRequire, register} = require(`module`); const {resolve} = require(`path`); +const {pathToFileURL} = require(`url`); const relPnpApiPath = "../../../../.pnp.cjs"; const absPnpApiPath = resolve(__dirname, relPnpApiPath); const absRequire = createRequire(absPnpApiPath); +const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); +const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); + +if (existsSync(absPnpApiPath)) { + if (!process.versions.pnp) { + // Setup the environment to be able to require typescript/lib/tsserver.js + require(absPnpApiPath).setup(); + if (isPnpLoaderEnabled && register) { + register(pathToFileURL(absPnpLoaderPath)); + } + } +} + const moduleWrapper = tsserver => { if (!process.versions.pnp) { return tsserver; @@ -214,11 +228,11 @@ const moduleWrapper = tsserver => { return tsserver; }; -if (existsSync(absPnpApiPath)) { - if (!process.versions.pnp) { - // Setup the environment to be able to require typescript/lib/tsserver.js - require(absPnpApiPath).setup(); - } +const [major, minor] = absRequire(`typescript/package.json`).version.split(`.`, 2).map(value => parseInt(value, 10)); +// In TypeScript@>=5.5 the tsserver uses the public TypeScript API so that needs to be patched as well. +// Ref https://github.com/microsoft/TypeScript/pull/55326 +if (major > 5 || (major === 5 && minor >= 5)) { + moduleWrapper(absRequire(`typescript`)); } // Defer to the real typescript/lib/tsserver.js your application uses diff --git a/.yarn/sdks/typescript/lib/tsserverlibrary.js b/.yarn/sdks/typescript/lib/tsserverlibrary.js index a68f028..7f9d7f9 100644 --- a/.yarn/sdks/typescript/lib/tsserverlibrary.js +++ b/.yarn/sdks/typescript/lib/tsserverlibrary.js @@ -1,14 +1,28 @@ #!/usr/bin/env node const {existsSync} = require(`fs`); -const {createRequire} = require(`module`); +const {createRequire, register} = require(`module`); const {resolve} = require(`path`); +const {pathToFileURL} = require(`url`); const relPnpApiPath = "../../../../.pnp.cjs"; const absPnpApiPath = resolve(__dirname, relPnpApiPath); const absRequire = createRequire(absPnpApiPath); +const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); +const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); + +if (existsSync(absPnpApiPath)) { + if (!process.versions.pnp) { + // Setup the environment to be able to require typescript/lib/tsserverlibrary.js + require(absPnpApiPath).setup(); + if (isPnpLoaderEnabled && register) { + register(pathToFileURL(absPnpLoaderPath)); + } + } +} + const moduleWrapper = tsserver => { if (!process.versions.pnp) { return tsserver; @@ -214,11 +228,11 @@ const moduleWrapper = tsserver => { return tsserver; }; -if (existsSync(absPnpApiPath)) { - if (!process.versions.pnp) { - // Setup the environment to be able to require typescript/lib/tsserverlibrary.js - require(absPnpApiPath).setup(); - } +const [major, minor] = absRequire(`typescript/package.json`).version.split(`.`, 2).map(value => parseInt(value, 10)); +// In TypeScript@>=5.5 the tsserver uses the public TypeScript API so that needs to be patched as well. +// Ref https://github.com/microsoft/TypeScript/pull/55326 +if (major > 5 || (major === 5 && minor >= 5)) { + moduleWrapper(absRequire(`typescript`)); } // Defer to the real typescript/lib/tsserverlibrary.js your application uses diff --git a/.yarn/sdks/typescript/lib/typescript.js b/.yarn/sdks/typescript/lib/typescript.js index b5f4db2..317b60b 100644 --- a/.yarn/sdks/typescript/lib/typescript.js +++ b/.yarn/sdks/typescript/lib/typescript.js @@ -1,18 +1,25 @@ #!/usr/bin/env node const {existsSync} = require(`fs`); -const {createRequire} = require(`module`); +const {createRequire, register} = require(`module`); const {resolve} = require(`path`); +const {pathToFileURL} = require(`url`); const relPnpApiPath = "../../../../.pnp.cjs"; const absPnpApiPath = resolve(__dirname, relPnpApiPath); const absRequire = createRequire(absPnpApiPath); +const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); +const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); + if (existsSync(absPnpApiPath)) { if (!process.versions.pnp) { // Setup the environment to be able to require typescript require(absPnpApiPath).setup(); + if (isPnpLoaderEnabled && register) { + register(pathToFileURL(absPnpLoaderPath)); + } } } diff --git a/package.json b/package.json index e761958..6989bbd 100644 --- a/package.json +++ b/package.json @@ -33,8 +33,7 @@ "eslint-plugin-react-refresh": "^0.4.5", "jest": "^29.7.0", "postcss": "^8.4.32", - "prettier": "^3.1.1", - "prettier-plugin-tailwindcss": "^0.5.9", + "prettier": "^3.3.2", "recoil": "^0.7.7", "tailwindcss": "^3.4.0", "ts-jest": "^29.1.1", diff --git a/yarn.lock b/yarn.lock index e3b6393..8034e5a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2529,8 +2529,7 @@ __metadata: eslint-plugin-react-refresh: "npm:^0.4.5" jest: "npm:^29.7.0" postcss: "npm:^8.4.32" - prettier: "npm:^3.1.1" - prettier-plugin-tailwindcss: "npm:^0.5.9" + prettier: "npm:^3.3.2" react: "npm:^18.2.0" react-dom: "npm:^18.2.0" react-router-dom: "npm:^6.21.1" @@ -4837,63 +4836,12 @@ __metadata: languageName: node linkType: hard -"prettier-plugin-tailwindcss@npm:^0.5.9": - version: 0.5.9 - resolution: "prettier-plugin-tailwindcss@npm:0.5.9" - peerDependencies: - "@ianvs/prettier-plugin-sort-imports": "*" - "@prettier/plugin-pug": "*" - "@shopify/prettier-plugin-liquid": "*" - "@trivago/prettier-plugin-sort-imports": "*" - prettier: ^3.0 - prettier-plugin-astro: "*" - prettier-plugin-css-order: "*" - prettier-plugin-import-sort: "*" - prettier-plugin-jsdoc: "*" - prettier-plugin-marko: "*" - prettier-plugin-organize-attributes: "*" - prettier-plugin-organize-imports: "*" - prettier-plugin-style-order: "*" - prettier-plugin-svelte: "*" - peerDependenciesMeta: - "@ianvs/prettier-plugin-sort-imports": - optional: true - "@prettier/plugin-pug": - optional: true - "@shopify/prettier-plugin-liquid": - optional: true - "@trivago/prettier-plugin-sort-imports": - optional: true - prettier-plugin-astro: - optional: true - prettier-plugin-css-order: - optional: true - prettier-plugin-import-sort: - optional: true - prettier-plugin-jsdoc: - optional: true - prettier-plugin-marko: - optional: true - prettier-plugin-organize-attributes: - optional: true - prettier-plugin-organize-imports: - optional: true - prettier-plugin-style-order: - optional: true - prettier-plugin-svelte: - optional: true - prettier-plugin-twig-melody: - optional: true - checksum: 6450ee245c7ce5a1989dae0425ce35304ed6d117c05f9306db27070f0c54b57448f30c9b88450ba263b66cf235932c8992b22199805c6dc2acc3f26c29e69b80 - languageName: node - linkType: hard - -"prettier@npm:^3.1.1": - version: 3.1.1 - resolution: "prettier@npm:3.1.1" +"prettier@npm:^3.3.2": + version: 3.3.2 + resolution: "prettier@npm:3.3.2" bin: prettier: bin/prettier.cjs - checksum: 26a249f321b97d26c04483f1bf2eeb22e082a76f4222a2c922bebdc60111691aad4ec3979610e83942e0b956058ec361d9e9c81c185172264eb6db9aa678082b + checksum: 83214e154afa5aa9b664c2506640212323eb1376b13379b2413dc351b7de0687629dca3f00ff2ec895ebd7e3a2adb7d7e231b6c77606e2358137f2150807405b languageName: node linkType: hard