Home

tailwind-ctp-intellisense @master - refs - log -
-
https://git.jolheiser.com/tailwind-ctp-intellisense.git
Tailwind intellisense + Catppuccin
tree log patch
Fix use of certain built-in node modules in config file (#745)
Signature
-----BEGIN PGP SIGNATURE----- wsBcBAABCAAQBQJkIH7YCRBK7hj4Ov3rIwAAvIoIAJ7V3URpy1umCIw05ksXEvEh wPWJsicq9sLndDHTbDJtToRg4NRw4rDS9G+rCfH/Yicjl0iFr+9jH3euQ5txHInJ qy068WJvx7hD10fee44FU2AZg0PYAU8KDQz6BtOWJMgDyXfCIhk5ikSbZHq19dnY +CmsjHETHWL/cpxhz4tnUCkkwVFQWqeyp4tu6BkH5t5OFnTutmuHgEI9A3DEkRLr HXNhAC0E4rpYV2FW+y/JtUOLd80LWJbiZnrXLcfB3CiLeI6U5FD87rffYr3BaOYR sts1PA4z7kOwVbaIQ7Czvo6M4okBqp8MQz2bfMY2rkqyunS5psnp8H55jKkPg/A= =iDdz -----END PGP SIGNATURE-----
Brad Cornes <hello@bradley.dev>
2 years ago
3 changed files, 32 additions(+), 13 deletions(-)
M package-lock.json -> package-lock.json
diff --git a/package-lock.json b/package-lock.json
index e1867a2c61983232552b9c0ad32994fb874ed952..c43ab5d57acbb3c237047c6847fc4e5b097c87ef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,7 +20,6 @@ 				"@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",
@@ -34,6 +33,7 @@ 				"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",
@@ -6069,9 +6069,9 @@ 			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
 			"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
 		},
 		"node_modules/builtin-modules": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
-			"integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==",
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+			"integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
 			"engines": {
 				"node": ">=6"
 			},
@@ -12093,6 +12093,20 @@ 			"version": "1.1.6",
 			"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
 			"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
 		},
+		"node_modules/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==",
+			"dependencies": {
+				"builtin-modules": "^3.3.0"
+			},
+			"engines": {
+				"node": ">=6"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
 		"node_modules/is-callable": {
 			"version": "1.2.7",
 			"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
@@ -26398,9 +26412,9 @@ 			"resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
 			"integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="
 		},
 		"builtin-modules": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
-			"integrity": "sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA=="
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz",
+			"integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw=="
 		},
 		"builtins": {
 			"version": "1.0.3",
@@ -31056,6 +31070,14 @@ 		"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",
M packages/tailwindcss-language-server/package.json -> packages/tailwindcss-language-server/package.json
diff --git a/packages/tailwindcss-language-server/package.json b/packages/tailwindcss-language-server/package.json
index f4200b61f720f289da30fe7d4d4a36b31fa98afb..540ce594b8d0971bc5d6340cb4e6206bac5929ac 100644
--- a/packages/tailwindcss-language-server/package.json
+++ b/packages/tailwindcss-language-server/package.json
@@ -40,7 +40,6 @@     "@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",
@@ -51,6 +50,7 @@     "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",
M packages/tailwindcss-language-server/src/lib/env.ts -> packages/tailwindcss-language-server/src/lib/env.ts
diff --git a/packages/tailwindcss-language-server/src/lib/env.ts b/packages/tailwindcss-language-server/src/lib/env.ts
index d6a538954d11272a0314c1d4d858a031578ee775..c676db522bc6b676f2cc32f09258fb300d72de6b 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 builtInModules from 'builtin-modules'
+import isBuiltinModule from 'is-builtin-module'
 
 process.env.TAILWIND_MODE = 'build'
 process.env.TAILWIND_DISABLE_TOUCH = 'true'
@@ -9,10 +9,7 @@
 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)