fix: onResolve is not called for glob imports

vitejs · Dec 9, 2023 · 66e16c1 · 66e16c1
1 parent 3e42611
commit 66e16c1
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/packages/vite/src/node/optimizer/scan.ts b/packages/vite/src/node/optimizer/scan.ts
@@ -561,16 +561,6 @@ function esbuildScanPlugin(
             external: doExternalize(path),
           }
         })
-        // onResolve is not called for glob imports.
-        // we need to add that here as well until esbuild calls onResolve for glob imports.
-        // https://github.com/evanw/esbuild/issues/3317
-        build.onLoad({ filter, namespace: 'file' }, () => {
-          const externalOnLoadResult: OnLoadResult = {
-            loader: 'js',
-            contents: 'export default {}',
-          }
-          return externalOnLoadResult
-        })
       }
 
       // css
@@ -647,6 +637,17 @@ function esbuildScanPlugin(
           contents,
         }
       })
+
+      // onResolve is not called for glob imports.
+      // we need to add that here as well until esbuild calls onResolve for glob imports.
+      // https://github.com/evanw/esbuild/issues/3317
+      build.onLoad({ filter: /.*/, namespace: 'file' }, () => {
+        const externalOnLoadResult: OnLoadResult = {
+          loader: 'js',
+          contents: 'export default {}',
+        }
+        return externalOnLoadResult
+      })
     },
   }
 }