fix: wrongly resolve to optimized doppelganger (#11290)

packages/vite/src/node/plugins/resolve.ts

@@ -874,13 +874,15 @@ export async function tryOptimizedResolve(
 
   const metadata = depsOptimizer.metadata
 
-  const depInfo = optimizedDepInfoFromId(metadata, id)
-  if (depInfo) {
-    return depsOptimizer.getOptimizedDepId(depInfo)
+  if (!importer) {
+    // no importer. try our best to find an optimized dep
+    const depInfo = optimizedDepInfoFromId(metadata, id)
+    if (depInfo) {
+      return depsOptimizer.getOptimizedDepId(depInfo)
+    }
+    return
   }
 
-  if (!importer) return
-
   // further check if id is imported by nested dependency
   let resolvedSrc: string | undefined
 

playground/resolve-optimized-dup-deps/__tests__/resolve-optimized-dup-deps.spec.ts

@@ -0,0 +1,7 @@
+import { expect, test } from 'vitest'
+import { page } from '~utils'
+
+test('resolve-optimized-dup-deps', async () => {
+  expect(await page.textContent('.a')).toBe('test-package-a:test-package-b-v2')
+  expect(await page.textContent('.b')).toBe('test-package-b-v1')
+})

playground/resolve-optimized-dup-deps/index.html

@@ -0,0 +1,17 @@
+<h2>direct dependency A</h2>
+<pre class="a"></pre>
+
+<h2>direct dependency B</h2>
+<pre class="b"></pre>
+
+<script type="module">
+  import A from '@vitejs/test-resolve-optimized-dup-deps-package-a'
+  import B from '@vitejs/test-resolve-optimized-dup-deps-package-b'
+
+  text('.a', A)
+  text('.b', B)
+
+  function text(sel, text) {
+    document.querySelector(sel).textContent = text
+  }
+</script>

playground/resolve-optimized-dup-deps/package-a/index.js

@@ -0,0 +1,6 @@
+import b from '@vitejs/test-resolve-optimized-dup-deps-package-b'
+
+// should get test-package-a:test-package-b-v2
+const result = 'test-package-a:' + b
+
+export default result

playground/resolve-optimized-dup-deps/package-a/package.json

@@ -0,0 +1,9 @@
+{
+  "name": "@vitejs/test-resolve-optimized-dup-deps-package-a",
+  "private": true,
+  "version": "1.0.0",
+  "main": "index.js",
+  "dependencies": {
+    "@vitejs/test-resolve-optimized-dup-deps-package-b": "file:../package-b-v2"
+  }
+}

playground/resolve-optimized-dup-deps/package-b-v1/index.js

@@ -0,0 +1,3 @@
+// test-package-b-v1 is install and imported by user
+// it is written in cjs and should be optimized
+module.exports = 'test-package-b-v1'

playground/resolve-optimized-dup-deps/package-b-v1/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "@vitejs/test-resolve-optimized-dup-deps-package-b",
+  "private": true,
+  "version": "1.0.0",
+  "main": "index.js"
+}

playground/resolve-optimized-dup-deps/package-b-v2/index.js

@@ -0,0 +1,3 @@
+// test-package-b-v2 is install and imported by test-package-a
+// it is written in esm. it is not optimized
+export default 'test-package-b-v2'

playground/resolve-optimized-dup-deps/package-b-v2/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "@vitejs/test-resolve-optimized-dup-deps-package-b",
+  "private": true,
+  "version": "2.0.0",
+  "main": "index.js"
+}

playground/resolve-optimized-dup-deps/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "@vitejs/test-resolve-optimized-dup-deps",
+  "private": true,
+  "version": "0.0.0",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "debug": "node --inspect-brk ../../packages/vite/bin/vite",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "@vitejs/test-resolve-optimized-dup-deps-package-a": "file:./package-a",
+    "@vitejs/test-resolve-optimized-dup-deps-package-b": "file:./package-b-v1"
+  }
+}

playground/resolve-optimized-dup-deps/vite.config.js

@@ -0,0 +1,8 @@
+/**
+ * @type {import('vite').UserConfig}
+ */
+module.exports = {
+  optimizeDeps: {
+    exclude: ['@vitejs/test-resolve-optimized-dup-deps-package-a'],
+  },
+}