Fix use of certain built-in node modules in config file (#745)

tailwindlabs · Mar 26, 2023 · 33f94ba · 33f94ba
1 parent 89dd104
commit 33f94ba
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/tailwindcss-language-server/package.json b/packages/tailwindcss-language-server/package.json
@@ -40,7 +40,6 @@
     "@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",
@@ -51,6 +50,7 @@
     "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
@@ -1,18 +1,15 @@
 import Module from 'module'
 import * as path from 'path'
 import resolveFrom from '../util/resolveFrom'
-import builtInModules from 'builtin-modules'
+import isBuiltinModule from 'is-builtin-module'
 
 process.env.TAILWIND_MODE = 'build'
 process.env.TAILWIND_DISABLE_TOUCH = 'true'
 
 let oldResolveFilename = (Module as any)._resolveFilename
 
 ;(Module as any)._resolveFilename = (id: any, parent: any) => {
-  if (
-    typeof id === 'string' &&
-    (builtInModules.includes(id) || builtInModules.includes(id.replace(/^node:/, '')))
-  ) {
+  if (typeof id === 'string' && isBuiltinModule(id)) {
     return oldResolveFilename(id, parent)
   }
   return resolveFrom(path.dirname(parent.id), id)