From b628db4e13506ecc595954f7f3d361bfd26dc5f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= <mateuszburzynski@gmail.com>
Date: Thu, 8 Dec 2022 11:46:33 +0100
Subject: [PATCH 1/5] fix(resolve): use only root package.json as exports
 source

---
 packages/vite/src/node/plugins/resolve.ts                | 2 +-
 playground/resolve/__tests__/resolve.spec.ts             | 4 ++++
 playground/resolve/exports-from-root/file.js             | 1 +
 playground/resolve/exports-from-root/index.js            | 0
 playground/resolve/exports-from-root/nested/file.js      | 1 +
 playground/resolve/exports-from-root/nested/package.json | 5 +++++
 playground/resolve/exports-from-root/package.json        | 9 +++++++++
 playground/resolve/index.html                            | 6 ++++++
 playground/resolve/package.json                          | 1 +
 pnpm-lock.yaml                                           | 8 ++++++++
 10 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 playground/resolve/exports-from-root/file.js
 create mode 100644 playground/resolve/exports-from-root/index.js
 create mode 100644 playground/resolve/exports-from-root/nested/file.js
 create mode 100644 playground/resolve/exports-from-root/nested/package.json
 create mode 100644 playground/resolve/exports-from-root/package.json

diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
index 2c45771c46e101..6dc767f7122fac 100644
--- a/packages/vite/src/node/plugins/resolve.ts
+++ b/packages/vite/src/node/plugins/resolve.ts
@@ -659,7 +659,7 @@ export function tryNodeResolve(
   // nearest package.json that may have the `exports` field
   let pkg: PackageData | undefined
 
-  let pkgId = possiblePkgIds.reverse().find((pkgId) => {
+  let pkgId = possiblePkgIds.find((pkgId) => {
     nearestPkg = resolvePackageData(
       pkgId,
       basedir,
diff --git a/playground/resolve/__tests__/resolve.spec.ts b/playground/resolve/__tests__/resolve.spec.ts
index 2181f6d3c8433e..2095260b8af79f 100644
--- a/playground/resolve/__tests__/resolve.spec.ts
+++ b/playground/resolve/__tests__/resolve.spec.ts
@@ -36,6 +36,10 @@ test('deep import with exports field + mapped dir', async () => {
   )
 })
 
+test('exports read from the root package.json', async () => {
+  expect(await page.textContent('.exports-from-root')).toMatch('[success]')
+})
+
 // this is how Svelte 3 is packaged
 test('deep import with exports and legacy fallback', async () => {
   expect(await page.textContent('.exports-legacy-fallback')).toMatch(
diff --git a/playground/resolve/exports-from-root/file.js b/playground/resolve/exports-from-root/file.js
new file mode 100644
index 00000000000000..c97992c496dde1
--- /dev/null
+++ b/playground/resolve/exports-from-root/file.js
@@ -0,0 +1 @@
+export const msg = '[success] exports from root (./file.js)'
diff --git a/playground/resolve/exports-from-root/index.js b/playground/resolve/exports-from-root/index.js
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/playground/resolve/exports-from-root/nested/file.js b/playground/resolve/exports-from-root/nested/file.js
new file mode 100644
index 00000000000000..78e96789d86b8b
--- /dev/null
+++ b/playground/resolve/exports-from-root/nested/file.js
@@ -0,0 +1 @@
+export const msg = 'fail exports from root (./nested/file.js)'
diff --git a/playground/resolve/exports-from-root/nested/package.json b/playground/resolve/exports-from-root/nested/package.json
new file mode 100644
index 00000000000000..0908b494205729
--- /dev/null
+++ b/playground/resolve/exports-from-root/nested/package.json
@@ -0,0 +1,5 @@
+{
+  "exports": {
+    ".": "./file.js"
+  }
+}
diff --git a/playground/resolve/exports-from-root/package.json b/playground/resolve/exports-from-root/package.json
new file mode 100644
index 00000000000000..1ec99410519211
--- /dev/null
+++ b/playground/resolve/exports-from-root/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@vitejs/test-resolve-exports-from-root",
+  "private": true,
+  "version": "1.0.0",
+  "exports": {
+    ".": "./index.js",
+    "./nested": "./file.js"
+  }
+}
diff --git a/playground/resolve/index.html b/playground/resolve/index.html
index 9aa1261f98c980..a07f85198e04e9 100644
--- a/playground/resolve/index.html
+++ b/playground/resolve/index.html
@@ -24,6 +24,9 @@ <h2>Deep import with exports field + mapped directory</h2>
 <h2>Exports field env priority</h2>
 <p class="exports-env">fail</p>
 
+<h2>Exports field read only from the root package.json</h2>
+<p class="exports-from-root">fail</p>
+
 <h2>Exports with legacy fallback</h2>
 <p class="exports-legacy-fallback">fail</p>
 
@@ -166,6 +169,9 @@ <h2>resolve package that contains # in path</h2>
   import { msg as exportsEnvMsg } from '@vitejs/test-resolve-exports-env'
   text('.exports-env', exportsEnvMsg)
 
+  import { msg as exportsFromRootMsg } from '@vitejs/test-resolve-exports-from-root/nested'
+  text('.exports-from-root', exportsFromRootMsg)
+
   import { msg as exportsLegacyFallbackMsg } from '@vitejs/test-resolve-exports-legacy-fallback/dir'
   text('.exports-legacy-fallback', exportsLegacyFallbackMsg)
 
diff --git a/playground/resolve/package.json b/playground/resolve/package.json
index d7e5f07b17f845..e808720708bca2 100644
--- a/playground/resolve/package.json
+++ b/playground/resolve/package.json
@@ -20,6 +20,7 @@
     "@vitejs/test-resolve-custom-condition": "link:./custom-condition",
     "@vitejs/test-resolve-custom-main-field": "link:./custom-main-field",
     "@vitejs/test-resolve-exports-env": "link:./exports-env",
+    "@vitejs/test-resolve-exports-from-root": "link:./exports-from-root",
     "@vitejs/test-resolve-exports-legacy-fallback": "link:./exports-legacy-fallback",
     "@vitejs/test-resolve-exports-path": "link:./exports-path",
     "@vitejs/test-resolve-linked": "workspace:*"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3c3c2891e62573..ea1f238914750d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -799,6 +799,7 @@ importers:
       '@vitejs/test-resolve-custom-condition': link:./custom-condition
       '@vitejs/test-resolve-custom-main-field': link:./custom-main-field
       '@vitejs/test-resolve-exports-env': link:./exports-env
+      '@vitejs/test-resolve-exports-from-root': link:./exports-from-root
       '@vitejs/test-resolve-exports-legacy-fallback': link:./exports-legacy-fallback
       '@vitejs/test-resolve-exports-path': link:./exports-path
       '@vitejs/test-resolve-linked': workspace:*
@@ -814,6 +815,7 @@ importers:
       '@vitejs/test-resolve-custom-condition': link:custom-condition
       '@vitejs/test-resolve-custom-main-field': link:custom-main-field
       '@vitejs/test-resolve-exports-env': link:exports-env
+      '@vitejs/test-resolve-exports-from-root': link:exports-from-root
       '@vitejs/test-resolve-exports-legacy-fallback': link:exports-legacy-fallback
       '@vitejs/test-resolve-exports-path': link:exports-path
       '@vitejs/test-resolve-linked': link:../resolve-linked
@@ -847,6 +849,12 @@ importers:
   playground/resolve/exports-env:
     specifiers: {}
 
+  playground/resolve/exports-from-root:
+    specifiers: {}
+
+  playground/resolve/exports-from-root/nested:
+    specifiers: {}
+
   playground/resolve/exports-legacy-fallback:
     specifiers: {}
 

From dc03c547305a704ac0dda390c654ab7707f65caa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= <mateuszburzynski@gmail.com>
Date: Thu, 29 Dec 2022 17:09:59 +0100
Subject: [PATCH 2/5] fix(resolve): declare `rootPkgId` before `.reverse()`
 mutates it

---
 packages/vite/src/node/plugins/resolve.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
index 6dc767f7122fac..72ab3284314983 100644
--- a/packages/vite/src/node/plugins/resolve.ts
+++ b/packages/vite/src/node/plugins/resolve.ts
@@ -659,7 +659,9 @@ export function tryNodeResolve(
   // nearest package.json that may have the `exports` field
   let pkg: PackageData | undefined
 
-  let pkgId = possiblePkgIds.find((pkgId) => {
+  const rootPkgId = possiblePkgIds[0]
+
+  let pkgId = possiblePkgIds.reverse().find((pkgId) => {
     nearestPkg = resolvePackageData(
       pkgId,
       basedir,
@@ -669,7 +671,6 @@ export function tryNodeResolve(
     return nearestPkg
   })!
 
-  const rootPkgId = possiblePkgIds[0]
   const rootPkg = resolvePackageData(
     rootPkgId,
     basedir,

From de249e7a7d534c58cd9332a651a135b32940818c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= <mateuszburzynski@gmail.com>
Date: Thu, 29 Dec 2022 18:07:32 +0100
Subject: [PATCH 3/5] chore(tests): add a resolve test for nested package
 scopes

---
 playground/resolve/__tests__/resolve.spec.ts           |  6 ++++++
 playground/resolve/exports-and-nested-scope/index.js   |  0
 .../exports-and-nested-scope/nested-scope/file.js      |  9 +++++++++
 .../exports-and-nested-scope/nested-scope/package.json |  4 ++++
 .../resolve/exports-and-nested-scope/package.json      | 10 ++++++++++
 playground/resolve/index.html                          |  6 ++++++
 playground/resolve/package.json                        |  1 +
 pnpm-lock.yaml                                         |  8 ++++++++
 8 files changed, 44 insertions(+)
 create mode 100644 playground/resolve/exports-and-nested-scope/index.js
 create mode 100644 playground/resolve/exports-and-nested-scope/nested-scope/file.js
 create mode 100644 playground/resolve/exports-and-nested-scope/nested-scope/package.json
 create mode 100644 playground/resolve/exports-and-nested-scope/package.json

diff --git a/playground/resolve/__tests__/resolve.spec.ts b/playground/resolve/__tests__/resolve.spec.ts
index 2095260b8af79f..f26156e6afcf1a 100644
--- a/playground/resolve/__tests__/resolve.spec.ts
+++ b/playground/resolve/__tests__/resolve.spec.ts
@@ -9,6 +9,12 @@ test('deep import', async () => {
   expect(await page.textContent('.deep-import')).toMatch('[2,4]')
 })
 
+test('exports and a nested package scope with a different type', async () => {
+  expect(await page.textContent('.exports-and-nested-scope')).toMatch(
+    '[success]',
+  )
+})
+
 test('entry with exports field', async () => {
   expect(await page.textContent('.exports-entry')).toMatch('[success]')
 })
diff --git a/playground/resolve/exports-and-nested-scope/index.js b/playground/resolve/exports-and-nested-scope/index.js
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/playground/resolve/exports-and-nested-scope/nested-scope/file.js b/playground/resolve/exports-and-nested-scope/nested-scope/file.js
new file mode 100644
index 00000000000000..a1c85b7262db21
--- /dev/null
+++ b/playground/resolve/exports-and-nested-scope/nested-scope/file.js
@@ -0,0 +1,9 @@
+'use strict'
+
+Object.defineProperty(exports, '__esModule', {
+  value: true,
+})
+exports.msg = void 0
+var msg =
+  '[success] commonjs .js file within root that has type: module (thanks to a package scope)'
+exports.msg = msg
diff --git a/playground/resolve/exports-and-nested-scope/nested-scope/package.json b/playground/resolve/exports-and-nested-scope/nested-scope/package.json
new file mode 100644
index 00000000000000..0fef86e3396e0b
--- /dev/null
+++ b/playground/resolve/exports-and-nested-scope/nested-scope/package.json
@@ -0,0 +1,4 @@
+{
+  "private": true,
+  "type": "commonjs"
+}
diff --git a/playground/resolve/exports-and-nested-scope/package.json b/playground/resolve/exports-and-nested-scope/package.json
new file mode 100644
index 00000000000000..4af41f2e6e5ff1
--- /dev/null
+++ b/playground/resolve/exports-and-nested-scope/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@vitejs/test-resolve-exports-and-nested-scope",
+  "private": true,
+  "version": "1.0.0",
+  "type": "module",
+  "exports": {
+    ".": "./index.js",
+    "./nested": "./nested-scope/file.js"
+  }
+}
diff --git a/playground/resolve/index.html b/playground/resolve/index.html
index a07f85198e04e9..6d512e68ad7b2d 100644
--- a/playground/resolve/index.html
+++ b/playground/resolve/index.html
@@ -6,6 +6,9 @@ <h2>Utf8-bom import</h2>
 <h2>Deep import</h2>
 <p>Should show [2,4]:<span class="pre deep-import">fail</span></p>
 
+<h2>Exports and a nested package scope with a different type</h2>
+<p class="exports-and-nested-scope">fail</p>
+
 <h2>Entry resolving with exports field</h2>
 <p class="exports-entry">fail</p>
 
@@ -146,6 +149,9 @@ <h2>resolve package that contains # in path</h2>
 
   text('.deep-import', JSON.stringify(slicedToArray(iterable, 2)))
 
+  import exportsAndNestedScope from '@vitejs/test-resolve-exports-and-nested-scope/nested'
+  text('.exports-and-nested-scope', exportsAndNestedScope.msg)
+
   // exports field
   import { msg } from '@vitejs/test-resolve-exports-path'
   text('.exports-entry', msg)
diff --git a/playground/resolve/package.json b/playground/resolve/package.json
index e808720708bca2..a375608977aefd 100644
--- a/playground/resolve/package.json
+++ b/playground/resolve/package.json
@@ -19,6 +19,7 @@
     "@vitejs/test-resolve-browser-module-field3": "link:./browser-module-field3",
     "@vitejs/test-resolve-custom-condition": "link:./custom-condition",
     "@vitejs/test-resolve-custom-main-field": "link:./custom-main-field",
+    "@vitejs/test-resolve-exports-and-nested-scope": "link:./exports-and-nested-scope",
     "@vitejs/test-resolve-exports-env": "link:./exports-env",
     "@vitejs/test-resolve-exports-from-root": "link:./exports-from-root",
     "@vitejs/test-resolve-exports-legacy-fallback": "link:./exports-legacy-fallback",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ea1f238914750d..9dba5e3fb1e9bd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -798,6 +798,7 @@ importers:
       '@vitejs/test-resolve-browser-module-field3': link:./browser-module-field3
       '@vitejs/test-resolve-custom-condition': link:./custom-condition
       '@vitejs/test-resolve-custom-main-field': link:./custom-main-field
+      '@vitejs/test-resolve-exports-and-nested-scope': link:./exports-and-nested-scope
       '@vitejs/test-resolve-exports-env': link:./exports-env
       '@vitejs/test-resolve-exports-from-root': link:./exports-from-root
       '@vitejs/test-resolve-exports-legacy-fallback': link:./exports-legacy-fallback
@@ -814,6 +815,7 @@ importers:
       '@vitejs/test-resolve-browser-module-field3': link:browser-module-field3
       '@vitejs/test-resolve-custom-condition': link:custom-condition
       '@vitejs/test-resolve-custom-main-field': link:custom-main-field
+      '@vitejs/test-resolve-exports-and-nested-scope': link:exports-and-nested-scope
       '@vitejs/test-resolve-exports-env': link:exports-env
       '@vitejs/test-resolve-exports-from-root': link:exports-from-root
       '@vitejs/test-resolve-exports-legacy-fallback': link:exports-legacy-fallback
@@ -846,6 +848,12 @@ importers:
   playground/resolve/custom-main-field:
     specifiers: {}
 
+  playground/resolve/exports-and-nested-scope:
+    specifiers: {}
+
+  playground/resolve/exports-and-nested-scope/nested-scope:
+    specifiers: {}
+
   playground/resolve/exports-env:
     specifiers: {}
 

From 008b72d43b78a0a77fc2151eece6dd01d0f59cea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= <mateuszburzynski@gmail.com>
Date: Fri, 30 Dec 2022 13:12:11 +0100
Subject: [PATCH 4/5] chore(tests): flip the `package.json#type`s in the added
 fixture

---
 .../exports-and-nested-scope/nested-scope/file.js        | 9 ++-------
 .../exports-and-nested-scope/nested-scope/package.json   | 2 +-
 playground/resolve/exports-and-nested-scope/package.json | 2 +-
 playground/resolve/index.html                            | 4 ++--
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/playground/resolve/exports-and-nested-scope/nested-scope/file.js b/playground/resolve/exports-and-nested-scope/nested-scope/file.js
index a1c85b7262db21..b183d5649f6ece 100644
--- a/playground/resolve/exports-and-nested-scope/nested-scope/file.js
+++ b/playground/resolve/exports-and-nested-scope/nested-scope/file.js
@@ -1,9 +1,4 @@
 'use strict'
 
-Object.defineProperty(exports, '__esModule', {
-  value: true,
-})
-exports.msg = void 0
-var msg =
-  '[success] commonjs .js file within root that has type: module (thanks to a package scope)'
-exports.msg = msg
+// intentionally use the default export here since default import from CJS has different semantics in node
+export default '[success] ES .js file within root that has type: commonjs (thanks to a package scope)'
diff --git a/playground/resolve/exports-and-nested-scope/nested-scope/package.json b/playground/resolve/exports-and-nested-scope/nested-scope/package.json
index 0fef86e3396e0b..e986b24bbae58b 100644
--- a/playground/resolve/exports-and-nested-scope/nested-scope/package.json
+++ b/playground/resolve/exports-and-nested-scope/nested-scope/package.json
@@ -1,4 +1,4 @@
 {
   "private": true,
-  "type": "commonjs"
+  "type": "module"
 }
diff --git a/playground/resolve/exports-and-nested-scope/package.json b/playground/resolve/exports-and-nested-scope/package.json
index 4af41f2e6e5ff1..7d40b793f6c055 100644
--- a/playground/resolve/exports-and-nested-scope/package.json
+++ b/playground/resolve/exports-and-nested-scope/package.json
@@ -2,7 +2,7 @@
   "name": "@vitejs/test-resolve-exports-and-nested-scope",
   "private": true,
   "version": "1.0.0",
-  "type": "module",
+  "type": "commonjs",
   "exports": {
     ".": "./index.js",
     "./nested": "./nested-scope/file.js"
diff --git a/playground/resolve/index.html b/playground/resolve/index.html
index 6d512e68ad7b2d..4c641bd9346271 100644
--- a/playground/resolve/index.html
+++ b/playground/resolve/index.html
@@ -149,8 +149,8 @@ <h2>resolve package that contains # in path</h2>
 
   text('.deep-import', JSON.stringify(slicedToArray(iterable, 2)))
 
-  import exportsAndNestedScope from '@vitejs/test-resolve-exports-and-nested-scope/nested'
-  text('.exports-and-nested-scope', exportsAndNestedScope.msg)
+  import exportsAndNestedScopeMsg from '@vitejs/test-resolve-exports-and-nested-scope/nested'
+  text('.exports-and-nested-scope', exportsAndNestedScopeMsg)
 
   // exports field
   import { msg } from '@vitejs/test-resolve-exports-path'

From 7a11ec1eafafaec299e7dff6d4834dc7718fb9fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20Burzy=C5=84ski?= <mateuszburzynski@gmail.com>
Date: Sat, 31 Dec 2022 16:35:03 +0100
Subject: [PATCH 5/5] fix(resolve): fix `package.json` vs `exports` lookups

---
 packages/vite/src/node/plugins/resolve.ts | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
index 72ab3284314983..1d47acff458478 100644
--- a/packages/vite/src/node/plugins/resolve.ts
+++ b/packages/vite/src/node/plugins/resolve.ts
@@ -654,14 +654,21 @@ export function tryNodeResolve(
     basedir = nestedResolveFrom(nestedRoot, basedir, preserveSymlinks)
   }
 
+  let pkg: PackageData | undefined
+  let pkgId: string | undefined
   // nearest package.json
   let nearestPkg: PackageData | undefined
-  // nearest package.json that may have the `exports` field
-  let pkg: PackageData | undefined
 
   const rootPkgId = possiblePkgIds[0]
 
-  let pkgId = possiblePkgIds.reverse().find((pkgId) => {
+  const rootPkg = resolvePackageData(
+    rootPkgId,
+    basedir,
+    preserveSymlinks,
+    packageCache,
+  )!
+
+  const nearestPkgId = [...possiblePkgIds].reverse().find((pkgId) => {
     nearestPkg = resolvePackageData(
       pkgId,
       basedir,
@@ -671,16 +678,11 @@ export function tryNodeResolve(
     return nearestPkg
   })!
 
-  const rootPkg = resolvePackageData(
-    rootPkgId,
-    basedir,
-    preserveSymlinks,
-    packageCache,
-  )!
   if (rootPkg?.data?.exports) {
-    pkg = rootPkg
     pkgId = rootPkgId
+    pkg = rootPkg
   } else {
+    pkgId = nearestPkgId
     pkg = nearestPkg
   }