From 87792cae8cf063e0f29163e14745a2ee24086baa Mon Sep 17 00:00:00 2001 From: L Lllvvuu Date: Wed, 14 Feb 2024 01:58:29 -0800 Subject: [PATCH] fix: bump `enhanced-resolve` for upstream fix Otherwise, the following is broken: ```javascript module.exports = require('@acme/ui/tailwind.config.cjs') ``` where `@acme/ui` has: ```json "exports": { "./*.cjs": "./*.cjs", }, ``` and requires the following workaround ```json "exports": { "./tailwind.config.cjs": "./tailwind.config.cjs", "./*.cjs": "./*.cjs", }, ``` bumping the package fixes this. --- package-lock.json | 10 +++++----- .../tailwindcss-language-server/ThirdPartyNotices.txt | 4 ++-- packages/tailwindcss-language-server/package.json | 2 +- .../src/util/resolveFrom.ts | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4a0c561e..61891c8a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2164,10 +2164,10 @@ "once": "^1.4.0" } }, - "node_modules/enhanced-resolve-301": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve-301/-/enhanced-resolve-301-0.0.1.tgz", - "integrity": "sha512-g/f3kXka2n15qdlm6ROmbKTumvXmZIbQraY/fNYFrUeMN4slbDWNsCswvpn6LhObdFXAaM/X/ATHUvRWk8+UVg==", + "node_modules/enhanced-resolve": { + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -7278,7 +7278,7 @@ "deepmerge": "4.2.2", "dlv": "1.1.3", "dset": "3.1.2", - "enhanced-resolve-301": "0.0.1", + "enhanced-resolve": "^5.15.0", "esbuild": "^0.19.5", "fast-glob": "3.2.4", "find-up": "5.0.0", diff --git a/packages/tailwindcss-language-server/ThirdPartyNotices.txt b/packages/tailwindcss-language-server/ThirdPartyNotices.txt index 24c16489..26d8efa8 100644 --- a/packages/tailwindcss-language-server/ThirdPartyNotices.txt +++ b/packages/tailwindcss-language-server/ThirdPartyNotices.txt @@ -614,7 +614,7 @@ THE SOFTWARE. ================================================================================ -enhanced-resolve-301@0.0.1 +enhanced-resolve@5.15.0 Copyright JS Foundation and other contributors @@ -1212,4 +1212,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file +THE SOFTWARE. diff --git a/packages/tailwindcss-language-server/package.json b/packages/tailwindcss-language-server/package.json index 9e53cc8d..b0f6e90d 100644 --- a/packages/tailwindcss-language-server/package.json +++ b/packages/tailwindcss-language-server/package.json @@ -51,7 +51,7 @@ "deepmerge": "4.2.2", "dlv": "1.1.3", "dset": "3.1.2", - "enhanced-resolve-301": "0.0.1", + "enhanced-resolve": "^5.15.0", "esbuild": "^0.19.5", "fast-glob": "3.2.4", "find-up": "5.0.0", diff --git a/packages/tailwindcss-language-server/src/util/resolveFrom.ts b/packages/tailwindcss-language-server/src/util/resolveFrom.ts index 37565df9..b390fd43 100644 --- a/packages/tailwindcss-language-server/src/util/resolveFrom.ts +++ b/packages/tailwindcss-language-server/src/util/resolveFrom.ts @@ -1,5 +1,5 @@ import * as fs from 'fs' -import { CachedInputFileSystem, ResolverFactory, Resolver, ResolveOptions } from 'enhanced-resolve-301' +import { CachedInputFileSystem, ResolverFactory, Resolver, ResolveOptions } from 'enhanced-resolve' import { equal } from 'tailwindcss-language-service/src/util/array' let pnpApi: any