From ebd4027292cc5f0b47d17eb53176924dfab10915 Mon Sep 17 00:00:00 2001
From: Artem Khodyush <greenkaa@gmail.com>
Date: Wed, 27 Oct 2021 04:44:51 -0700
Subject: [PATCH] fix: exclude dependency of optimized dependency (fix: 5410)
 (#5411)

Co-authored-by: Artem Khodyush <pakafpub@gmail.com>
Co-authored-by: Shinigami <chrissi92@hotmail.de>
---
 .../nested-deps/__tests__/nested-deps.spec.ts |  1 +
 packages/playground/nested-deps/index.html    |  6 +++++
 packages/playground/nested-deps/package.json  |  3 ++-
 .../nested-deps/test-package-e/index.js       |  2 ++
 .../nested-deps/test-package-e/package.json   |  9 +++++++
 .../test-package-e-excluded/index.js          | 11 ++++++++
 .../test-package-e-excluded/package.json      |  5 ++++
 .../test-package-e-included/index.js          |  5 ++++
 .../test-package-e-included/package.json      |  8 ++++++
 .../playground/nested-deps/vite.config.js     |  5 ++--
 .../src/node/optimizer/esbuildDepPlugin.ts    | 10 +++++++-
 packages/vite/src/node/optimizer/scan.ts      |  3 ++-
 .../vite/src/node/plugins/importAnalysis.ts   | 25 ++++++++++++++++---
 packages/vite/src/node/utils.ts               |  7 ++++++
 pnpm-lock.yaml                                | 19 ++++++++++++++
 15 files changed, 111 insertions(+), 8 deletions(-)
 create mode 100644 packages/playground/nested-deps/test-package-e/index.js
 create mode 100644 packages/playground/nested-deps/test-package-e/package.json
 create mode 100644 packages/playground/nested-deps/test-package-e/test-package-e-excluded/index.js
 create mode 100644 packages/playground/nested-deps/test-package-e/test-package-e-excluded/package.json
 create mode 100644 packages/playground/nested-deps/test-package-e/test-package-e-included/index.js
 create mode 100644 packages/playground/nested-deps/test-package-e/test-package-e-included/package.json

diff --git a/packages/playground/nested-deps/__tests__/nested-deps.spec.ts b/packages/playground/nested-deps/__tests__/nested-deps.spec.ts
index dac548d0e4193e..2ef0e191da7b50 100644
--- a/packages/playground/nested-deps/__tests__/nested-deps.spec.ts
+++ b/packages/playground/nested-deps/__tests__/nested-deps.spec.ts
@@ -7,4 +7,5 @@ test('handle nested package', async () => {
   expect(await page.textContent('.side-c')).toBe(c)
   expect(await page.textContent('.d')).toBe('D@1.0.0')
   expect(await page.textContent('.nested-d')).toBe('D-nested@1.0.0')
+  expect(await page.textContent('.nested-e')).toBe('1')
 })
diff --git a/packages/playground/nested-deps/index.html b/packages/playground/nested-deps/index.html
index 3467c3d9e425af..3243c1689bf0cd 100644
--- a/packages/playground/nested-deps/index.html
+++ b/packages/playground/nested-deps/index.html
@@ -19,12 +19,16 @@ <h2>direct dependency D</h2>
 <h2>nested dependency nested-D (dep of D)</h2>
 <pre class="nested-d"></pre>
 
+<h2>exclude dependency of pre-bundled dependency</h2>
+<div>nested module instance count: <span class="nested-e"></span></div>
+
 <script type="module">
   import A from 'test-package-a'
   import B, { A as nestedA } from 'test-package-b'
   import C from 'test-package-c'
   import { C as sideC } from 'test-package-c/side'
   import D, { nestedD } from 'test-package-d'
+  import { testExcluded } from 'test-package-e'
 
   text('.a', A)
   text('.b', B)
@@ -36,6 +40,8 @@ <h2>nested dependency nested-D (dep of D)</h2>
   text('.d', D)
   text('.nested-d', nestedD)
 
+  text('.nested-e', testExcluded())
+
   function text(sel, text) {
     document.querySelector(sel).textContent = text
   }
diff --git a/packages/playground/nested-deps/package.json b/packages/playground/nested-deps/package.json
index e705a5c96ae103..b2cb1e5b72ee3a 100644
--- a/packages/playground/nested-deps/package.json
+++ b/packages/playground/nested-deps/package.json
@@ -12,6 +12,7 @@
     "test-package-a": "link:./test-package-a",
     "test-package-b": "link:./test-package-b",
     "test-package-c": "link:./test-package-c",
-    "test-package-d": "link:./test-package-d"
+    "test-package-d": "link:./test-package-d",
+    "test-package-e": "link:./test-package-e"
   }
 }
diff --git a/packages/playground/nested-deps/test-package-e/index.js b/packages/playground/nested-deps/test-package-e/index.js
new file mode 100644
index 00000000000000..3d9c38b0ab3886
--- /dev/null
+++ b/packages/playground/nested-deps/test-package-e/index.js
@@ -0,0 +1,2 @@
+export { testIncluded } from 'test-package-e-included'
+export { testExcluded } from 'test-package-e-excluded'
diff --git a/packages/playground/nested-deps/test-package-e/package.json b/packages/playground/nested-deps/test-package-e/package.json
new file mode 100644
index 00000000000000..27b85d976f9160
--- /dev/null
+++ b/packages/playground/nested-deps/test-package-e/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "test-package-e",
+  "version": "0.1.0",
+  "main": "index.js",
+  "dependencies": {
+    "test-package-e-excluded": "link:./test-package-e-excluded",
+    "test-package-e-included": "link:./test-package-e-included"
+  }
+}
diff --git a/packages/playground/nested-deps/test-package-e/test-package-e-excluded/index.js b/packages/playground/nested-deps/test-package-e/test-package-e-excluded/index.js
new file mode 100644
index 00000000000000..bb7be494269f76
--- /dev/null
+++ b/packages/playground/nested-deps/test-package-e/test-package-e-excluded/index.js
@@ -0,0 +1,11 @@
+const key = '$$excludedDependencyInstanceCount'
+
+if (!(key in window)) {
+  window[key] = 0
+}
+
+++window[key]
+
+export function testExcluded() {
+  return window[key]
+}
diff --git a/packages/playground/nested-deps/test-package-e/test-package-e-excluded/package.json b/packages/playground/nested-deps/test-package-e/test-package-e-excluded/package.json
new file mode 100644
index 00000000000000..09dd3a1469ce19
--- /dev/null
+++ b/packages/playground/nested-deps/test-package-e/test-package-e-excluded/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "test-package-e-excluded",
+  "version": "0.1.0",
+  "main": "index.js"
+}
diff --git a/packages/playground/nested-deps/test-package-e/test-package-e-included/index.js b/packages/playground/nested-deps/test-package-e/test-package-e-included/index.js
new file mode 100644
index 00000000000000..23239f157bfa38
--- /dev/null
+++ b/packages/playground/nested-deps/test-package-e/test-package-e-included/index.js
@@ -0,0 +1,5 @@
+import { testExcluded } from 'test-package-e-excluded'
+
+export function testIncluded() {
+  return testExcluded()
+}
diff --git a/packages/playground/nested-deps/test-package-e/test-package-e-included/package.json b/packages/playground/nested-deps/test-package-e/test-package-e-included/package.json
new file mode 100644
index 00000000000000..3c984f175ca382
--- /dev/null
+++ b/packages/playground/nested-deps/test-package-e/test-package-e-included/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "test-package-e-included",
+  "version": "0.1.0",
+  "main": "index.js",
+  "dependencies": {
+    "test-package-e-excluded": "link:../test-package-e-excluded"
+  }
+}
diff --git a/packages/playground/nested-deps/vite.config.js b/packages/playground/nested-deps/vite.config.js
index cc3bcb2ada226b..015598af64b016 100644
--- a/packages/playground/nested-deps/vite.config.js
+++ b/packages/playground/nested-deps/vite.config.js
@@ -8,8 +8,9 @@ module.exports = {
       'test-package-b',
       'test-package-c',
       'test-package-c/side',
-      'test-package-d    > test-package-d-nested'
+      'test-package-d    > test-package-d-nested',
+      'test-package-e-included'
     ],
-    exclude: ['test-package-d']
+    exclude: ['test-package-d', 'test-package-e-excluded']
   }
 }
diff --git a/packages/vite/src/node/optimizer/esbuildDepPlugin.ts b/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
index 9854beb0936d83..54732be1b4e79b 100644
--- a/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
+++ b/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
@@ -6,7 +6,8 @@ import {
   isRunningWithYarnPnp,
   flattenId,
   normalizePath,
-  isExternalUrl
+  isExternalUrl,
+  moduleListContains
 } from '../utils'
 import { browserExternalId } from '../plugins/resolve'
 import { ExportsData } from '.'
@@ -99,6 +100,13 @@ export function esbuildDepPlugin(
       build.onResolve(
         { filter: /^[\w@][^:]/ },
         async ({ path: id, importer, kind }) => {
+          if (moduleListContains(config.optimizeDeps?.exclude, id)) {
+            return {
+              path: id,
+              external: true
+            }
+          }
+
           // ensure esbuild uses our resolved entries
           let entry: { path: string; namespace: string } | undefined
           // if this is an entry, return entry namespace resolve result
diff --git a/packages/vite/src/node/optimizer/scan.ts b/packages/vite/src/node/optimizer/scan.ts
index aac6f24cd79f4b..dd7444ce446c9a 100644
--- a/packages/vite/src/node/optimizer/scan.ts
+++ b/packages/vite/src/node/optimizer/scan.ts
@@ -14,6 +14,7 @@ import {
   normalizePath,
   isObject,
   cleanUrl,
+  moduleListContains,
   externalRE,
   dataUrlRE,
   multilineCommentsRE,
@@ -302,7 +303,7 @@ function esbuildScanPlugin(
           filter: /^[\w@][^:]/
         },
         async ({ path: id, importer }) => {
-          if (exclude?.some((e) => e === id || id.startsWith(e + '/'))) {
+          if (moduleListContains(exclude, id)) {
             return externalUnlessEntry({ path: id })
           }
           if (depImports[id]) {
diff --git a/packages/vite/src/node/plugins/importAnalysis.ts b/packages/vite/src/node/plugins/importAnalysis.ts
index fa2d261f577004..c061c0898397d9 100644
--- a/packages/vite/src/node/plugins/importAnalysis.ts
+++ b/packages/vite/src/node/plugins/importAnalysis.ts
@@ -19,7 +19,8 @@ import {
   timeFrom,
   normalizePath,
   removeImportQuery,
-  unwrapId
+  unwrapId,
+  moduleListContains
 } from '../utils'
 import {
   debugHmr,
@@ -179,13 +180,31 @@ export function importAnalysisPlugin(config: ResolvedConfig): Plugin {
           url = url.replace(base, '/')
         }
 
-        const resolved = await this.resolve(url, importer)
+        let importerFile = importer
+        if (
+          moduleListContains(config.optimizeDeps?.exclude, url) &&
+          server._optimizeDepsMetadata
+        ) {
+          // if the dependency encountered in the optimized file was excluded from the optimization
+          // the dependency needs to be resolved starting from the original source location of the optimized file
+          // because starting from node_modules/.vite will not find the dependency if it was not hoisted
+          // (that is, if it is under node_modules directory in the package source of the optimized file)
+          for (const optimizedModule of Object.values(
+            server._optimizeDepsMetadata.optimized
+          )) {
+            if (optimizedModule.file === importerModule.file) {
+              importerFile = optimizedModule.src
+            }
+          }
+        }
+
+        const resolved = await this.resolve(url, importerFile)
 
         if (!resolved) {
           this.error(
             `Failed to resolve import "${url}" from "${path.relative(
               process.cwd(),
-              importer
+              importerFile
             )}". Does the file exist?`,
             pos
           )
diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
index 88db6822137a51..4c40cccbc35254 100644
--- a/packages/vite/src/node/utils.ts
+++ b/packages/vite/src/node/utils.ts
@@ -43,6 +43,13 @@ export function isBuiltin(id: string): boolean {
   return builtins.includes(id)
 }
 
+export function moduleListContains(
+  moduleList: string[] | undefined,
+  id: string
+): boolean | undefined {
+  return moduleList?.some((m) => m === id || id.startsWith(m + '/'))
+}
+
 export const bareImportRE = /^[\w@](?!.*:\/\/)/
 export const deepImportRE = /^([^@][^/]*)\/|^(@[^/]+\/[^/]+)\//
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 66151564440bec..cba08f67c06888 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -226,11 +226,13 @@ importers:
       test-package-b: link:./test-package-b
       test-package-c: link:./test-package-c
       test-package-d: link:./test-package-d
+      test-package-e: link:./test-package-e
     dependencies:
       test-package-a: link:test-package-a
       test-package-b: link:test-package-b
       test-package-c: link:test-package-c
       test-package-d: link:test-package-d
+      test-package-e: link:test-package-e
 
   packages/playground/nested-deps/test-package-a:
     specifiers: {}
@@ -250,6 +252,23 @@ importers:
   packages/playground/nested-deps/test-package-d/test-package-d-nested:
     specifiers: {}
 
+  packages/playground/nested-deps/test-package-e:
+    specifiers:
+      test-package-e-excluded: link:./test-package-e-excluded
+      test-package-e-included: link:./test-package-e-included
+    dependencies:
+      test-package-e-excluded: link:test-package-e-excluded
+      test-package-e-included: link:test-package-e-included
+
+  packages/playground/nested-deps/test-package-e/test-package-e-excluded:
+    specifiers: {}
+
+  packages/playground/nested-deps/test-package-e/test-package-e-included:
+    specifiers:
+      test-package-e-excluded: link:../test-package-e-excluded
+    dependencies:
+      test-package-e-excluded: link:../test-package-e-excluded
+
   packages/playground/optimize-deps:
     specifiers:
       '@vitejs/plugin-vue': workspace:*