From 00a79ec88472cbcc767c1187f919ce372215f573 Mon Sep 17 00:00:00 2001
From: Bjorn Lu <bjornlu.dev@gmail.com>
Date: Thu, 19 Jan 2023 00:25:16 +0800
Subject: [PATCH] refactor: upgrade resolve.exports (#11712)

---
 packages/vite/package.json                | 2 +-
 packages/vite/src/node/plugins/resolve.ts | 8 +++++---
 pnpm-lock.yaml                            | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/vite/package.json b/packages/vite/package.json
index 732f50428febe4..15bd5dbcbbf3f1 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -119,7 +119,7 @@
     "postcss-import": "^15.1.0",
     "postcss-load-config": "^4.0.1",
     "postcss-modules": "^6.0.0",
-    "resolve.exports": "^1.1.1",
+    "resolve.exports": "^2.0.0",
     "rollup-plugin-license": "^3.0.1",
     "sirv": "^2.0.2",
     "source-map-js": "^1.0.2",
diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
index 81480c9e67dbf5..e0df31fc055598 100644
--- a/packages/vite/src/node/plugins/resolve.ts
+++ b/packages/vite/src/node/plugins/resolve.ts
@@ -2,7 +2,7 @@ import fs from 'node:fs'
 import path from 'node:path'
 import colors from 'picocolors'
 import type { PartialResolvedId } from 'rollup'
-import { resolve as _resolveExports } from 'resolve.exports'
+import { exports } from 'resolve.exports'
 import { hasESMSyntax } from 'mlly'
 import type { Plugin } from '../plugin'
 import {
@@ -937,7 +937,7 @@ export function resolvePackageEntry(
     return cached
   }
   try {
-    let entryPoint: string | undefined | void
+    let entryPoint: string | undefined
 
     // resolve exports field with highest priority
     // using https://github.com/lukeed/resolve.exports
@@ -1099,11 +1099,13 @@ function resolveExports(
     conditions.push(...options.conditions)
   }
 
-  return _resolveExports(pkg, key, {
+  const result = exports(pkg, key, {
     browser: targetWeb && !conditions.includes('node'),
     require: options.isRequire && !conditions.includes('import'),
     conditions,
   })
+
+  return result ? result[0] : undefined
 }
 
 function resolveDeepImport(
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7c308f3ab1e151..e4a1a4f578814e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -214,7 +214,7 @@ importers:
       postcss-load-config: ^4.0.1
       postcss-modules: ^6.0.0
       resolve: ^1.22.1
-      resolve.exports: ^1.1.1
+      resolve.exports: ^2.0.0
       rollup: ^3.7.0
       rollup-plugin-license: ^3.0.1
       sirv: ^2.0.2
@@ -279,7 +279,7 @@ importers:
       postcss-import: 15.1.0_postcss@8.4.21
       postcss-load-config: 4.0.1_postcss@8.4.21
       postcss-modules: 6.0.0_postcss@8.4.21
-      resolve.exports: 1.1.1
+      resolve.exports: 2.0.0
       rollup-plugin-license: 3.0.1_rollup@3.7.0
       sirv: 2.0.2_w6q35pvk7bmykgqf2hieut43iq
       source-map-js: 1.0.2
@@ -7256,8 +7256,8 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /resolve.exports/1.1.1:
-    resolution: {integrity: sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==}
+  /resolve.exports/2.0.0:
+    resolution: {integrity: sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==}
     engines: {node: '>=10'}
     dev: true