fix(ssr): fix 'global' variable name conflict

vitejs · Aug 2, 2024 · 6bdff8b · 6bdff8b
1 parent 0f56e17
commit 6bdff8b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/packages/vite/src/node/ssr/__tests__/fixtures/global/export.js b/packages/vite/src/node/ssr/__tests__/fixtures/global/export.js
@@ -0,0 +1 @@
+export const global = 'ok'
diff --git a/packages/vite/src/node/ssr/__tests__/fixtures/global/test.js b/packages/vite/src/node/ssr/__tests__/fixtures/global/test.js
@@ -0,0 +1 @@
+export default global
diff --git a/packages/vite/src/node/ssr/__tests__/ssrLoadModule.spec.ts b/packages/vite/src/node/ssr/__tests__/ssrLoadModule.spec.ts
@@ -62,3 +62,15 @@ test('import.meta.filename/dirname returns same value with Node', async () => {
   expect(viteValue.dirname).toBe(path.dirname(filename))
   expect(viteValue.filename).toBe(filename)
 })
+
+test('can export global', async () => {
+  const server = await createDevServer()
+  const mod = await server.ssrLoadModule('/fixtures/global/export.js')
+  expect(mod.global).toBe('ok')
+})
+
+test('can access nodejs global', async () => {
+  const server = await createDevServer()
+  const mod = await server.ssrLoadModule('/fixtures/global/test.js')
+  expect(mod.default).toBe(globalThis)
+})
diff --git a/packages/vite/src/node/ssr/ssrModuleLoader.ts b/packages/vite/src/node/ssr/ssrModuleLoader.ts
@@ -213,7 +213,6 @@ async function instantiateModule(
 
   try {
     const initModule = new AsyncFunction(
-      `global`,
       ssrModuleExportsKey,
       ssrImportMetaKey,
       ssrImportKey,
@@ -224,7 +223,6 @@ async function instantiateModule(
         `\n//# sourceURL=${mod.id}${sourceMapSuffix}`,
     )
     await initModule(
-      context.global,
       ssrModule,
       ssrImportMeta,
       ssrImport,