test: update test code

vitejs · Nov 1, 2021 · 384da59 · 384da59
1 parent b2657ab
commit 384da59
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/playground/ssr-vue/src/entry-server.js b/packages/playground/ssr-vue/src/entry-server.js
@@ -1,10 +1,11 @@
 import { createApp } from './main'
 import { renderToString } from 'vue/server-renderer'
-import path from 'path'
+import path, { resolve } from 'path'
 import assert from 'assert'
 
-// test require relative path
-const { foo } = require('../config')
+// test require expression path
+const cwd = process.env.JEST_WORKER_ID !== undefined ? resolve(process.cwd(), './packages/playground/ssr-vue') : process.cwd()
+const { foo } = require(resolve(cwd, './config'))
 assert.strictEqual(foo, 'foo')
 // test require bare module
 const serverRenderer = require('vue/server-renderer')

diff --git a/packages/vite/src/node/ssr/ssrModuleLoader.ts b/packages/vite/src/node/ssr/ssrModuleLoader.ts
@@ -122,9 +122,8 @@ async function instantiateModule(
     return moduleGraph.urlToModuleMap.get(dep)?.ssrModule
   }
   const ssrRequire = (dep: string) => {
-    const { dirname } = path
     return require(require.resolve(dep, {
-      paths: [dirname(mod.file!)]
+      paths: [path.dirname(mod.file!)]
     }))
   }