From e9f4c295924b7488b0bc22008811ef28f34f35fa Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Fri, 26 Feb 2021 17:16:47 -0500
Subject: [PATCH] refactor: use esbuild resolve kind info for cjs dep resolving

---
 packages/vite/package.json                    |  2 +-
 .../src/node/optimizer/esbuildDepPlugin.ts    | 35 +++++++++----------
 yarn.lock                                     |  2 +-
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/packages/vite/package.json b/packages/vite/package.json
index fabf5074362fc8..b4ec40bc507ac3 100644
--- a/packages/vite/package.json
+++ b/packages/vite/package.json
@@ -44,7 +44,7 @@
   },
   "//": "READ .github/contributing.md to understand what to put under deps vs. devDeps!",
   "dependencies": {
-    "esbuild": "^0.8.47",
+    "esbuild": "^0.8.52",
     "postcss": "^8.2.1",
     "resolve": "^1.19.0",
     "rollup": "^2.38.5"
diff --git a/packages/vite/src/node/optimizer/esbuildDepPlugin.ts b/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
index 349895870ae987..47f4cd017ca1ab 100644
--- a/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
+++ b/packages/vite/src/node/optimizer/esbuildDepPlugin.ts
@@ -1,5 +1,5 @@
 import path from 'path'
-import { Loader, Plugin } from 'esbuild'
+import { Loader, Plugin, ResolveKind } from 'esbuild'
 import { KNOWN_ASSET_TYPES } from '../constants'
 import { ResolvedConfig } from '..'
 import {
@@ -35,11 +35,19 @@ export function esbuildDepPlugin(
   exportsData: Record<string, ExportsData>,
   config: ResolvedConfig
 ): Plugin {
+  // default resovler which prefers ESM
   const _resolve = config.createResolver({ asSrc: false })
 
+  // cjs resolver that prefers Node
+  const _resolveRequire = config.createResolver({
+    asSrc: false,
+    isRequire: true
+  })
+
   const resolve = (
     id: string,
     importer: string,
+    kind: ResolveKind,
     resolveDir?: string
   ): Promise<string | undefined> => {
     let _importer
@@ -51,7 +59,8 @@ export function esbuildDepPlugin(
       // map importer ids to file paths for correct resolution
       _importer = importer in qualified ? qualified[importer] : importer
     }
-    return _resolve(id, _importer)
+    const resolver = kind.startsWith('require') ? _resolveRequire : _resolve
+    return resolver(id, _importer)
   }
 
   return {
@@ -62,8 +71,8 @@ export function esbuildDepPlugin(
         {
           filter: new RegExp(`\\.(` + externalTypes.join('|') + `)(\\?.*)?$`)
         },
-        async ({ path: id, importer }) => {
-          const resolved = await resolve(id, importer)
+        async ({ path: id, importer, kind }) => {
+          const resolved = await resolve(id, importer, kind)
           if (resolved) {
             return {
               path: resolved,
@@ -89,7 +98,7 @@ export function esbuildDepPlugin(
 
       build.onResolve(
         { filter: /^[\w@][^:]/ },
-        async ({ path: id, importer }) => {
+        async ({ path: id, importer, kind }) => {
           const isEntry = !importer
           // ensure esbuild uses our resolved entires
           let entry
@@ -102,18 +111,8 @@ export function esbuildDepPlugin(
             return entry
           }
 
-          // #2199 @babel/runtime 7.13 now has mjs fallback for non-esm helpers
-          // it can break if we use Vite's resolver here since we don't know if
-          // the user is importing or requiring it. Fallback to esbuild resolver
-          // here.
-          // Hopefully esbuild will expose that information in the future
-          // https://github.com/evanw/esbuild/issues/879
-          if (id.startsWith('@babel/runtime')) {
-            return
-          }
-
           // use vite's own resolver
-          const resolved = await resolve(id, importer)
+          const resolved = await resolve(id, importer, kind)
           if (resolved) {
             if (resolved.startsWith(browserExternalId)) {
               return {
@@ -198,9 +197,9 @@ export function esbuildDepPlugin(
       if (isRunningWithYarnPnp) {
         build.onResolve(
           { filter: /.*/ },
-          async ({ path, importer, resolveDir }) => ({
+          async ({ path, importer, kind, resolveDir }) => ({
             // pass along resolveDir for entries
-            path: await resolve(path, importer, resolveDir)
+            path: await resolve(path, importer, kind, resolveDir)
           })
         )
         build.onLoad({ filter: /.*/ }, async (args) => ({
diff --git a/yarn.lock b/yarn.lock
index b3693364d78d0b..324fcea97657eb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2812,7 +2812,7 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-esbuild@^0.8.47:
+esbuild@^0.8.52:
   version "0.8.52"
   resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.8.52.tgz#6dabf11c517af449a96d66da20dfc204ee7b5294"
   integrity sha512-b5KzFweLLXoXQwdC/e2+Z80c8uo2M5MgP7yQEEebkFw6In4T9CvYcNoM2ElvJt8ByO04zAZUV0fZkXmXoi2s9A==