fix(resolver): skip known ESM entries when resolving a require call

Fixes vitejs#7578
sodatea · Apr 2, 2022 · aa81f4b · aa81f4b
1 parent 21456b1
commit aa81f4b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/packages/vite/src/node/constants.ts b/packages/vite/src/node/constants.ts
@@ -6,6 +6,21 @@ export const DEFAULT_MAIN_FIELDS = [
   'jsnext'
 ]
 
+/**
+ * A non-exhaustive list of known-to-be-ES-module entry names.
+ * From <https://github.com/stereobooster/package.json#package-bundlers>
+ */
+export const KNOWN_ESM_MAIN_FIELDS = [
+  'module',
+  'jsnext:main',
+  'jsnext',
+  'esnext',
+  'es2015',
+  'es2020',
+  'fesm2015',
+  'fesm2020'
+]
+
 export const DEFAULT_EXTENSIONS = [
   '.mjs',
   '.js',

diff --git a/packages/vite/src/node/plugins/resolve.ts b/packages/vite/src/node/plugins/resolve.ts
@@ -7,6 +7,7 @@ import {
   SPECIAL_QUERY_RE,
   DEFAULT_EXTENSIONS,
   DEFAULT_MAIN_FIELDS,
+  KNOWN_ESM_MAIN_FIELDS,
   OPTIMIZABLE_ENTRY_RE,
   DEP_VERSION_RE
 } from '../constants'
@@ -777,6 +778,11 @@ export function resolvePackageEntry(
 
     if (!entryPoint || entryPoint.endsWith('.mjs')) {
       for (const field of options.mainFields || DEFAULT_MAIN_FIELDS) {
+        // If the initiator is a `require` call, don't use the ESM entries
+        if (options.isRequire && KNOWN_ESM_MAIN_FIELDS.includes(field)) {
+          continue
+        }
+
         if (typeof data[field] === 'string') {
           entryPoint = data[field]
           break