fix(ssr): avoid resolving externals to mjs

vitejs · Jan 23, 2021 · 3955fe3 · 3955fe3
1 parent ce2d49a
commit 3955fe3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/packages/vite/src/node/ssr/ssrModuleLoader.ts b/packages/vite/src/node/ssr/ssrModuleLoader.ts
@@ -131,7 +131,7 @@ export async function ssrLoadModule(
 
 function nodeRequire(id: string, importer: string | null) {
   const mod = importer
-    ? require(resolveFrom(id, path.dirname(importer)))
+    ? require(resolveFrom(id, path.dirname(importer), true))
     : require(id)
   // rollup-style default import interop for cjs
   return new Proxy(mod, {

diff --git a/packages/vite/src/node/utils.ts b/packages/vite/src/node/utils.ts
@@ -21,10 +21,12 @@ try {
   isRunningWithYarnPnp = Boolean(require('pnpapi'))
 } catch {}
 
-export function resolveFrom(id: string, basedir: string) {
+const ssrExtensions = ['.js', '.json', '.node']
+
+export function resolveFrom(id: string, basedir: string, ssr = false) {
   return resolve.sync(id, {
     basedir,
-    extensions: SUPPORTED_EXTS,
+    extensions: ssr ? ssrExtensions : SUPPORTED_EXTS,
     // necessary to work with pnpm
     preserveSymlinks: isRunningWithYarnPnp || false
   })