fix(optimizer): handle externals in pnp compat

vitejs · Jan 18, 2022 · cd19392 · cd19392
1 parent 7fae8d7
commit cd19392
Showing 1 changed file with 27 additions and 20 deletions.
diff --git a/packages/vite/src/node/optimizer/esbuildDepPlugin.ts b/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
@@ -68,6 +68,24 @@ export function esbuildDepPlugin(
     return resolver(id, _importer, undefined, ssr)
   }
 
+  const resolveResult = (id: string, resolved: string) => {
+    if (resolved.startsWith(browserExternalId)) {
+      return {
+        path: id,
+        namespace: 'browser-external'
+      }
+    }
+    if (isExternalUrl(resolved)) {
+      return {
+        path: resolved,
+        external: true
+      }
+    }
+    return {
+      path: path.resolve(resolved)
+    }
+  }
+
   return {
     name: 'vite:dep-pre-bundle',
     setup(build) {
@@ -122,21 +140,7 @@ export function esbuildDepPlugin(
           // use vite's own resolver
           const resolved = await resolve(id, importer, kind)
           if (resolved) {
-            if (resolved.startsWith(browserExternalId)) {
-              return {
-                path: id,
-                namespace: 'browser-external'
-              }
-            }
-            if (isExternalUrl(resolved)) {
-              return {
-                path: resolved,
-                external: true
-              }
-            }
-            return {
-              path: path.resolve(resolved)
-            }
+            return resolveResult(id, resolved)
           }
         }
       )
@@ -209,15 +213,18 @@ export function esbuildDepPlugin(
       if (isRunningWithYarnPnp) {
         build.onResolve(
           { filter: /.*/ },
-          async ({ path, importer, kind, resolveDir, namespace }) => ({
-            // pass along resolveDir for entries
-            path: await resolve(
-              path,
+          async ({ path: id, importer, kind, resolveDir, namespace }) => {
+            const resolved = await resolve(
+              id,
               importer,
               kind,
+              // pass along resolveDir for entries
               namespace === 'dep' ? resolveDir : undefined
             )
-          })
+            if (resolved) {
+              return resolveResult(id, resolved)
+            }
+          }
         )
         build.onLoad({ filter: /.*/ }, async (args) => ({
           contents: await require('fs').promises.readFile(args.path),