diff --git a/package-lock.json b/package-lock.json index dd4a0bda..570769bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2827,10 +2827,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.16.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.1.tgz", + "integrity": "sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -8095,7 +8095,7 @@ "deepmerge": "4.2.2", "dlv": "1.1.3", "dset": "3.1.2", - "enhanced-resolve-301": "0.0.1", + "enhanced-resolve": "^5.16.1", "esbuild": "^0.20.2", "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 5ede64e3..2488882e 100644 --- a/packages/tailwindcss-language-server/package.json +++ b/packages/tailwindcss-language-server/package.json @@ -62,8 +62,8 @@ "deepmerge": "4.2.2", "dlv": "1.1.3", "dset": "3.1.2", - "enhanced-resolve-301": "0.0.1", "esbuild": "^0.20.2", + "enhanced-resolve": "^5.16.1", "fast-glob": "3.2.4", "find-up": "5.0.0", "is-builtin-module": "3.2.1", diff --git a/packages/tailwindcss-language-server/src/util/resolve.ts b/packages/tailwindcss-language-server/src/util/resolve.ts index 9f65d78b..8d6e9504 100644 --- a/packages/tailwindcss-language-server/src/util/resolve.ts +++ b/packages/tailwindcss-language-server/src/util/resolve.ts @@ -4,7 +4,7 @@ import { ResolverFactory, Resolver, ResolveOptions, -} from 'enhanced-resolve-301' +} from 'enhanced-resolve' export function createResolver(options: Partial = {}): Resolver { return ResolverFactory.createResolver({ diff --git a/packages/tailwindcss-language-server/src/util/resolveFrom.ts b/packages/tailwindcss-language-server/src/util/resolveFrom.ts index 6d378c2e..04a09c1c 100644 --- a/packages/tailwindcss-language-server/src/util/resolveFrom.ts +++ b/packages/tailwindcss-language-server/src/util/resolveFrom.ts @@ -26,6 +26,5 @@ export default function resolveFrom(from?: string, id?: string): string { let result = resolver.resolveSync({}, from, id) if (result === false) throw Error() - // https://github.com/webpack/enhanced-resolve/issues/282 - return result.replace(/\0#/g, '#') + return result }