Skip to content

Commit

Permalink
fix(ssr): fix ssr node require for virtual modules
Browse files Browse the repository at this point in the history
  • Loading branch information
yyx990803 committed Feb 9, 2021
1 parent 9af1517 commit fa2d7d6
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions packages/vite/src/node/ssr/ssrModuleLoader.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -69,15 +70,15 @@ 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
}
}

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))
}
Expand Down Expand Up @@ -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, {
Expand All @@ -141,14 +142,17 @@ function nodeRequire(id: string, importer: string | null) {

const resolveCache = new Map<string, string>()

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
}

0 comments on commit fa2d7d6

Please sign in to comment.