fix: revert vitejs#11290 (vitejs#11412)

futurGH · Feb 26, 2023 · 9a5b2b0 · 9a5b2b0
1 parent c89bd1a
commit 9a5b2b0
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 127 deletions.
diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
@@ -874,15 +874,13 @@ export async function tryOptimizedResolve(
 
   const metadata = depsOptimizer.metadata
 
-  if (!importer) {
-    // no importer. try our best to find an optimized dep
-    const depInfo = optimizedDepInfoFromId(metadata, id)
-    if (depInfo) {
-      return depsOptimizer.getOptimizedDepId(depInfo)
-    }
-    return
+  const depInfo = optimizedDepInfoFromId(metadata, id)
+  if (depInfo) {
+    return depsOptimizer.getOptimizedDepId(depInfo)
   }
 
+  if (!importer) return
+
   // further check if id is imported by nested dependency
   let resolvedSrc: string | undefined
 

diff --git a/playground/resolve-optimized-dup-deps/__tests__/resolve-optimized-dup-deps.spec.ts b/playground/resolve-optimized-dup-deps/__tests__/resolve-optimized-dup-deps.spec.ts
diff --git a/playground/resolve-optimized-dup-deps/index.html b/playground/resolve-optimized-dup-deps/index.html
diff --git a/playground/resolve-optimized-dup-deps/package-a/index.js b/playground/resolve-optimized-dup-deps/package-a/index.js
diff --git a/playground/resolve-optimized-dup-deps/package-a/package.json b/playground/resolve-optimized-dup-deps/package-a/package.json
diff --git a/playground/resolve-optimized-dup-deps/package-b-v1/index.js b/playground/resolve-optimized-dup-deps/package-b-v1/index.js
diff --git a/playground/resolve-optimized-dup-deps/package-b-v1/package.json b/playground/resolve-optimized-dup-deps/package-b-v1/package.json
diff --git a/playground/resolve-optimized-dup-deps/package-b-v2/index.js b/playground/resolve-optimized-dup-deps/package-b-v2/index.js
diff --git a/playground/resolve-optimized-dup-deps/package-b-v2/package.json b/playground/resolve-optimized-dup-deps/package-b-v2/package.json
diff --git a/playground/resolve-optimized-dup-deps/package.json b/playground/resolve-optimized-dup-deps/package.json
diff --git a/playground/resolve-optimized-dup-deps/vite.config.js b/playground/resolve-optimized-dup-deps/vite.config.js
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml