1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
diff --git a/packages/tailwindcss-language-server/src/util/resolveFrom.ts b/packages/tailwindcss-language-server/src/util/resolveFrom.ts
index 5c139951a22b5a7e6af15fd01cf7c2aba4d84d80..b390fd43919b28463b764e1df8060ba7b4d80a83 100644
--- a/packages/tailwindcss-language-server/src/util/resolveFrom.ts
+++ b/packages/tailwindcss-language-server/src/util/resolveFrom.ts
@@ -1,5 +1,9 @@
import * as fs from 'fs'
import { CachedInputFileSystem, ResolverFactory, Resolver, ResolveOptions } from 'enhanced-resolve'
+import { equal } from 'tailwindcss-language-service/src/util/array'
+
+let pnpApi: any
+let extensions = Object.keys(require.extensions)
function createResolver(options: Partial<ResolveOptions> = {}): Resolver {
return ResolverFactory.createResolver({
@@ -7,18 +11,28 @@ fileSystem: new CachedInputFileSystem(fs, 4000),
useSyncFileSystemCalls: true,
// cachePredicate: () => false,
conditionNames: ['node', 'require'],
+ extensions,
+ pnpApi,
...options,
})
}
let resolver = createResolver()
-export function setPnpApi(pnpApi: any): void {
- resolver = createResolver({ pnpApi })
+export function setPnpApi(newPnpApi: any): void {
+ pnpApi = newPnpApi
+ resolver = createResolver()
}
export default function resolveFrom(from?: string, id?: string): string {
if (id.startsWith('\\\\')) return id
+
+ let newExtensions = Object.keys(require.extensions)
+ if (!equal(newExtensions, extensions)) {
+ extensions = newExtensions
+ resolver = createResolver()
+ }
+
let result = resolver.resolveSync({}, from, id)
if (result === false) throw Error()
// https://github.com/webpack/enhanced-resolve/issues/282
|