From 03b9674cb294e96ba118600262d22a567c5ae7aa Mon Sep 17 00:00:00 2001
From: Senao <48955231+XiSenao@users.noreply.github.com>
Date: Tue, 12 Mar 2024 21:10:04 +0800
Subject: [PATCH] feat: support for self-referencing (#16068)

---
 packages/vite/src/node/plugins/resolve.ts          | 14 +++++++++++++-
 .../nested-deps/__tests__/nested-deps.spec.ts      |  1 +
 playground/nested-deps/index.html                  |  6 ++++++
 playground/nested-deps/package.json                |  3 ++-
 playground/self-referencing/index.js               |  1 +
 playground/self-referencing/package.json           |  8 ++++++++
 playground/self-referencing/test/index.js          |  1 +
 pnpm-lock.yaml                                     |  5 +++++
 8 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 playground/self-referencing/index.js
 create mode 100644 playground/self-referencing/package.json
 create mode 100644 playground/self-referencing/test/index.js

diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
index a9b68b1fe..c02f1554a 100644
--- a/packages/vite/src/node/plugins/resolve.ts
+++ b/packages/vite/src/node/plugins/resolve.ts
@@ -735,7 +735,19 @@ export function tryNodeResolve(
     basedir = root
   }
 
-  const pkg = resolvePackageData(pkgId, basedir, preserveSymlinks, packageCache)
+  let selfPkg = null
+  if (!isBuiltin(id) && !id.includes('\0') && bareImportRE.test(id)) {
+    // check if it's a self reference dep.
+    const selfPackageData = findNearestPackageData(basedir, packageCache)
+    selfPkg =
+      selfPackageData?.data.exports && selfPackageData?.data.name === pkgId
+        ? selfPackageData
+        : null
+  }
+
+  const pkg =
+    selfPkg ||
+    resolvePackageData(pkgId, basedir, preserveSymlinks, packageCache)
   if (!pkg) {
     // if import can't be found, check if it's an optional peer dep.
     // if so, we can resolve to a special id that errors only when imported.
diff --git a/playground/nested-deps/__tests__/nested-deps.spec.ts b/playground/nested-deps/__tests__/nested-deps.spec.ts
index 04618ece5..d59c571db 100644
--- a/playground/nested-deps/__tests__/nested-deps.spec.ts
+++ b/playground/nested-deps/__tests__/nested-deps.spec.ts
@@ -14,4 +14,5 @@ test('handle nested package', async () => {
   // expect(await page.textContent('.nested-e')).toBe('1')
 
   expect(await page.textContent('.absolute-f')).toBe('F@2.0.0')
+  expect(await page.textContent('.self-referencing')).toBe('true')
 })
diff --git a/playground/nested-deps/index.html b/playground/nested-deps/index.html
index 86dbc149f..d06916f77 100644
--- a/playground/nested-deps/index.html
+++ b/playground/nested-deps/index.html
@@ -24,6 +24,9 @@
 
 <h2>absolute dependency path: <span class="absolute-f"></span></h2>
 
+<h2>self referencing</h2>
+<pre class="self-referencing"></pre>
+
 <script type="module">
   import A from '@vitejs/test-package-a'
   import B, { A as nestedA } from '@vitejs/test-package-b'
@@ -32,6 +35,7 @@
   import D, { nestedD } from '@vitejs/test-package-d'
   // import { testExcluded } from '@vitejs/test-package-e'
   import F from '__F_ABSOLUTE_PACKAGE_PATH__'
+  import { isSelfReference } from '@vitejs/self-referencing/test'
 
   text('.a', A)
   text('.b', B)
@@ -47,6 +51,8 @@
 
   text('.absolute-f', F)
 
+  text('.self-referencing', isSelfReference)
+
   function text(sel, text) {
     document.querySelector(sel).textContent = text
   }
diff --git a/playground/nested-deps/package.json b/playground/nested-deps/package.json
index 742103352..b01ec8179 100644
--- a/playground/nested-deps/package.json
+++ b/playground/nested-deps/package.json
@@ -15,6 +15,7 @@
     "@vitejs/test-package-c": "link:./test-package-c",
     "@vitejs/test-package-d": "link:./test-package-d",
     "@vitejs/test-package-e": "link:./test-package-e",
-    "@vitejs/test-package-f": "link:./test-package-f"
+    "@vitejs/test-package-f": "link:./test-package-f",
+    "@vitejs/self-referencing": "link:../self-referencing"
   }
 }
diff --git a/playground/self-referencing/index.js b/playground/self-referencing/index.js
new file mode 100644
index 000000000..677689175
--- /dev/null
+++ b/playground/self-referencing/index.js
@@ -0,0 +1 @@
+export const isSelfReference = true
diff --git a/playground/self-referencing/package.json b/playground/self-referencing/package.json
new file mode 100644
index 000000000..d0022da4e
--- /dev/null
+++ b/playground/self-referencing/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "@vitejs/self-referencing",
+  "type": "module",
+  "exports": {
+    ".": "./index.js",
+    "./test": "./test/index.js"
+  }
+}
diff --git a/playground/self-referencing/test/index.js b/playground/self-referencing/test/index.js
new file mode 100644
index 000000000..2192a75f4
--- /dev/null
+++ b/playground/self-referencing/test/index.js
@@ -0,0 +1 @@
+export { isSelfReference } from '@vitejs/self-referencing'
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 688600034..4618dc802 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -814,6 +814,9 @@ importers:
 
   playground/nested-deps:
     dependencies:
+      '@vitejs/self-referencing':
+        specifier: link:../self-referencing
+        version: link:../self-referencing
       '@vitejs/test-package-a':
         specifier: link:./test-package-a
         version: link:test-package-a
@@ -1252,6 +1255,8 @@ importers:
         specifier: 0.10.64
         version: 0.10.64
 
+  playground/self-referencing: {}
+
   playground/ssr:
     devDependencies:
       express: