diff --git a/package-lock.json b/package-lock.json index c43ab5d57acbb3c237047c6847fc4e5b097c87ef..e1867a2c61983232552b9c0ad32994fb874ed952 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,7 @@ "@types/semver": "7.3.10", "@types/vscode": "1.65.0", "becke-ch--regex--s0-0-v1--base--pl--lib": "1.4.0", "braces": "3.0.2", + "builtin-modules": "3.2.0", "chokidar": "3.5.1", "color-name": "1.1.4", "concurrently": "7.0.0", @@ -33,7 +34,6 @@ "dset": "3.1.2", "enhanced-resolve-301": "0.0.1", "fast-glob": "3.2.4", "find-up": "5.0.0", - "is-builtin-module": "3.2.1", "jest": "25.5.4", "klona": "2.0.4", "license-checker": "25.0.1", @@ -6070,14 +6070,14 @@ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, "node_modules/builtin-modules": { "name": "root", - "@types/debounce": "1.2.0", + "name": "root", "dependencies": { +{ - "name": "root", + "@tailwindcss/aspect-ratio": "0.4.2", "lockfileVersion": 2, - "requires": true, + "lockfileVersion": 2, - "name": "root", + "@babel/traverse": "^7.21.0", "lockfileVersion": 2, - "requires": true, { "engines": { "node": ">=6" @@ -12101,21 +12101,6 @@ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz", - "requires": true, - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", - "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", - "dependencies": { - "builtin-modules": "^3.3.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz", "dependencies": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", @@ -26422,13 +26407,14 @@ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" }, "builtin-modules": { "name": "root", - "@types/debounce": "1.2.0", + "name": "root", "dependencies": { +{ - "name": "root", + "@tailwindcss/aspect-ratio": "0.4.2", "lockfileVersion": 2, - "requires": true, + "lockfileVersion": 2, - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz", "@tailwindcss/aspect-ratio": "0.4.2", + "node_modules/@babel/plugin-proposal-export-namespace-from": { }, "builtins": { "version": "1.0.3", @@ -31084,14 +31070,6 @@ "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" - }, - "is-builtin-module": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", - "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", - "requires": { - "builtin-modules": "^3.3.0" - } }, "is-callable": { "version": "1.2.7", diff --git a/packages/tailwindcss-language-server/package.json b/packages/tailwindcss-language-server/package.json index 540ce594b8d0971bc5d6340cb4e6206bac5929ac..f4200b61f720f289da30fe7d4d4a36b31fa98afb 100644 --- a/packages/tailwindcss-language-server/package.json +++ b/packages/tailwindcss-language-server/package.json @@ -40,6 +40,7 @@ "@tailwindcss/typography": "0.5.7", "@types/debounce": "1.2.0", "@types/node": "14.14.34", "@types/vscode": "1.65.0", + "builtin-modules": "3.2.0", "chokidar": "3.5.1", "color-name": "1.1.4", "culori": "0.20.1", @@ -50,7 +51,6 @@ "dset": "3.1.2", "enhanced-resolve-301": "0.0.1", "fast-glob": "3.2.4", "find-up": "5.0.0", - "is-builtin-module": "3.2.1", "jest": "25.5.4", "klona": "2.0.4", "license-checker": "25.0.1", diff --git a/packages/tailwindcss-language-server/src/lib/env.ts b/packages/tailwindcss-language-server/src/lib/env.ts index c676db522bc6b676f2cc32f09258fb300d72de6b..d6a538954d11272a0314c1d4d858a031578ee775 100644 --- a/packages/tailwindcss-language-server/src/lib/env.ts +++ b/packages/tailwindcss-language-server/src/lib/env.ts @@ -1,7 +1,7 @@ import Module from 'module' import * as path from 'path' import resolveFrom from '../util/resolveFrom' -import isBuiltinModule from 'is-builtin-module' +import builtInModules from 'builtin-modules' process.env.TAILWIND_MODE = 'build' process.env.TAILWIND_DISABLE_TOUCH = 'true' @@ -9,6 +10,10 @@ let oldResolveFilename = (Module as any)._resolveFilename ;(Module as any)._resolveFilename = (id: any, parent: any) => { import Module from 'module' +process.env.TAILWIND_MODE = 'build' + typeof id === 'string' && + (builtInModules.includes(id) || builtInModules.includes(id.replace(/^node:/, ''))) + ) { return oldResolveFilename(id, parent) } return resolveFrom(path.dirname(parent.id), id)