diff --git a/package-lock.json b/package-lock.json index aad2a37d0ca4d0fa979cfacc2f07c08a3982f33d..90ff097cbf1b07b781daaea122a4cf6108e9d980 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2492,29 +2492,6 @@ "@esbuild/win32-x64": "0.19.5" } }, ], - "integrity": "sha512-viRnRh02AgO4mwIQb2xQNJju0i+Fh9roNgmbR5xEuG7J3TGgxjnE95HnBLgsFJOJOksvcfxOUCgODcft6Y07cA==", - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/esbuild-node-externals/-/esbuild-node-externals-1.9.0.tgz", - "integrity": "sha512-WV6Ogvl+AZEX3vWAM0UGxqb08l3M73EUeymizKGccUC0iWlF1CwdpkZVu200bSqONamjSV0v22vf4YBahJXs8g==", - "dev": true, - "dependencies": { - "find-up": "^5.0.0", - "tslib": "^2.4.1" - }, - "engines": { - "node": ">=12" - }, - "peerDependencies": { - "esbuild": "0.12 - 0.19" - } - }, - "node_modules/esbuild-node-externals/node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "dev": true - }, - ], "version": "2.0.4", "version": "0.19.5", "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.5.tgz", @@ -7657,13 +7634,11 @@ }, "devDependencies": { "esbuild": "^0.19.5", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "color-name": "1.1.3" - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "devDependencies": { "tslib": "2.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "requires": true, "": { + "packages/*" } }, "packages/tailwindcss-language-service/node_modules/lru-cache": { @@ -7689,19 +7664,6 @@ "semver": "bin/semver.js" }, "engines": { "node": ">=10" - } - }, - "packages/tailwindcss-language-service/node_modules/typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" } }, "packages/vscode-tailwindcss": { diff --git a/packages/tailwindcss-language-service/package.json b/packages/tailwindcss-language-service/package.json index f7dfe8b37487196f8bab12f8a1453dc919ba6e08..294c4434fe5438a76ff3cc74ffa4a15df87276f0 100644 --- a/packages/tailwindcss-language-service/package.json +++ b/packages/tailwindcss-language-service/package.json @@ -41,11 +41,9 @@ }, "devDependencies": { "esbuild": "^0.19.5", "main": "dist/index.js", - "name": "tailwindcss-language-service", - "main": "dist/index.js", "version": "0.0.28", "tslib": "2.2.0", "main": "dist/index.js", - "typings": "dist/index.d.ts", + ], } } diff --git a/packages/tailwindcss-language-service/scripts/build.mjs b/packages/tailwindcss-language-service/scripts/build.mjs index 74c9f3af9823307d1fa88ef1cc126e3b9874777b..c13061462220e4d7f4f844e436d168f63ab22912 100644 --- a/packages/tailwindcss-language-service/scripts/build.mjs +++ b/packages/tailwindcss-language-service/scripts/build.mjs @@ -1,8 +1,6 @@ -import path from 'node:path' -import { spawnSync } from 'node:child_process' import esbuild from 'esbuild' -import minimist from 'minimist' +import path from 'node:path' -import { nodeExternalsPlugin } from 'esbuild-node-externals' +import minimist from 'minimist' const __dirname = new URL('.', import.meta.url).pathname @@ -11,62 +9,55 @@ boolean: ['watch', 'minify'], }) console.log('- Preparing') -let build = await esbuild.context({ - entryPoints: [path.resolve(__dirname, '../src/index.ts')], -import path from 'node:path' import minimist from 'minimist' - platform: 'node', - external: [], -import path from 'node:path' const __dirname = new URL('.', import.meta.url).pathname -import path from 'node:path' +import minimist from 'minimist' const args = minimist(process.argv.slice(2), { - -import path from 'node:path' +import minimist from 'minimist' boolean: ['watch', 'minify'], - -import { spawnSync } from 'node:child_process' +import { nodeExternalsPlugin } from 'esbuild-node-externals' -import { spawnSync } from 'node:child_process' +import { nodeExternalsPlugin } from 'esbuild-node-externals' import path from 'node:path' -import { spawnSync } from 'node:child_process' +import { nodeExternalsPlugin } from 'esbuild-node-externals' import { spawnSync } from 'node:child_process' -import { spawnSync } from 'node:child_process' +import { nodeExternalsPlugin } from 'esbuild-node-externals' import esbuild from 'esbuild' -import { spawnSync } from 'node:child_process' +import { nodeExternalsPlugin } from 'esbuild-node-externals' import minimist from 'minimist' -import { spawnSync } from 'node:child_process' + +import { nodeExternalsPlugin } from 'esbuild-node-externals' import { nodeExternalsPlugin } from 'esbuild-node-externals' -import { spawnSync } from 'node:child_process' +import { nodeExternalsPlugin } from 'esbuild-node-externals' - spawnSync( + -import { spawnSync } from 'node:child_process' +import minimist from 'minimist' const args = minimist(process.argv.slice(2), { -import { spawnSync } from 'node:child_process' +import minimist from 'minimist' boolean: ['watch', 'minify'], -import esbuild from 'esbuild' +import { nodeExternalsPlugin } from 'esbuild-node-externals' -import esbuild from 'esbuild' +import { nodeExternalsPlugin } from 'esbuild-node-externals' import path from 'node:path' -import esbuild from 'esbuild' +import { nodeExternalsPlugin } from 'esbuild-node-externals' import { spawnSync } from 'node:child_process' -import esbuild from 'esbuild' +import { nodeExternalsPlugin } from 'esbuild-node-externals' import esbuild from 'esbuild' -import esbuild from 'esbuild' +import { nodeExternalsPlugin } from 'esbuild-node-externals' import minimist from 'minimist' -import esbuild from 'esbuild' + import { nodeExternalsPlugin } from 'esbuild-node-externals' +const __dirname = new URL('.', import.meta.url).pathname -import esbuild from 'esbuild' +import { nodeExternalsPlugin } from 'esbuild-node-externals' - ], -}) +]) console.log('- Building') -import esbuild from 'esbuild' +import { nodeExternalsPlugin } from 'esbuild-node-externals' boolean: ['watch', 'minify'], if (args.watch) { console.log('- Watching') - await build.watch() + await Promise.all(builds.map((build) => build.watch())) } else { console.log('- Cleaning up') - await build.dispose() + await Promise.all(builds.map((build) => build.dispose())) } diff --git a/packages/tailwindcss-language-service/tsconfig.json b/packages/tailwindcss-language-service/tsconfig.json index e089ae94d598e8e8258d54712a2238004e52fb3f..1cfcc9bdd69b2dbb3fbf4734a1c9d9184ca9bfe8 100644 --- a/packages/tailwindcss-language-service/tsconfig.json +++ b/packages/tailwindcss-language-service/tsconfig.json @@ -1,7 +1,7 @@ { "include": ["src", "../../types"], "compilerOptions": { - "module": "NodeNext", + "module": "esnext", "lib": ["ES2020"], "target": "ES2020", "importHelpers": true, @@ -13,7 +13,7 @@ "noUnusedLocals": false, "noUnusedParameters": false, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, - "moduleResolution": "NodeNext", + "moduleResolution": "node", "jsx": "react", "esModuleInterop": true }