From fa2d7d66c16c2156354b6888a2f0bd4b47262ca2 Mon Sep 17 00:00:00 2001 From: Evan You Date: Tue, 9 Feb 2021 09:54:19 -0500 Subject: [PATCH] fix(ssr): fix ssr node require for virtual modules --- packages/vite/src/node/ssr/ssrModuleLoader.ts | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/packages/vite/src/node/ssr/ssrModuleLoader.ts b/packages/vite/src/node/ssr/ssrModuleLoader.ts index 40013e6bd133cc..98cd0d237c7f38 100644 --- a/packages/vite/src/node/ssr/ssrModuleLoader.ts +++ b/packages/vite/src/node/ssr/ssrModuleLoader.ts @@ -1,6 +1,7 @@ +import fs from 'fs' import path from 'path' import { ViteDevServer } from '..' -import { resolveFrom } from '../utils' +import { cleanUrl, resolveFrom } from '../utils' import { ssrRewriteStacktrace } from './ssrStacktrace' import { ssrExportAllKey, @@ -69,7 +70,7 @@ export async function ssrLoadModule( const ssrImport = (dep: string) => { if (isExternal(dep)) { - return nodeRequire(dep, mod.file) + return nodeRequire(dep, mod.file, server.config.root) } else { return moduleGraph.urlToModuleMap.get(dep)?.ssrModule } @@ -77,7 +78,7 @@ export async function ssrLoadModule( const ssrDynamicImport = (dep: string) => { if (isExternal(dep)) { - return Promise.resolve(nodeRequire(dep, mod.file)) + return Promise.resolve(nodeRequire(dep, mod.file, server.config.root)) } else { return ssrLoadModule(dep, server, isolated, context, urlStack.concat(url)) } @@ -127,8 +128,8 @@ export async function ssrLoadModule( return ssrModule } -function nodeRequire(id: string, importer: string | null) { - const mod = importer ? require(resolve(id, importer)) : require(id) +function nodeRequire(id: string, importer: string | null, root: string) { + const mod = require(resolve(id, importer, root)) const defaultExport = mod.__esModule ? mod.default : mod // rollup-style default import interop for cjs return new Proxy(mod, { @@ -141,14 +142,17 @@ function nodeRequire(id: string, importer: string | null) { const resolveCache = new Map() -function resolve(id: string, importer: string) { - const dir = path.dirname(importer) - const key = id + dir +function resolve(id: string, importer: string | null, root: string) { + const key = id + importer + root const cached = resolveCache.get(key) if (cached) { return cached } - const resolved = resolveFrom(id, dir, true) + const resolveDir = + importer && fs.existsSync(cleanUrl(importer)) + ? path.dirname(importer) + : root + const resolved = resolveFrom(id, resolveDir, true) resolveCache.set(key, resolved) return resolved }