diff --git a/src/bundler/entry_points.zig b/src/bundler/entry_points.zig index ca3196bf15..fdf2df2d1e 100644 --- a/src/bundler/entry_points.zig +++ b/src/bundler/entry_points.zig @@ -169,7 +169,7 @@ pub const ServerEntryPoint = struct { \\if (typeof entryNamespace?.then === 'function') {{ \\ entryNamespace = entryNamespace.then((entryNamespace) => {{ \\ var def = entryNamespace?.default; - \\ if (def && (typeof def.fetch === 'function' || def.app != undefined)) {{ + \\ if (def && def !== globalThis && (typeof def.fetch === 'function' || def.app != undefined)) {{ \\ var server = globalThis[hmrSymbol]; \\ if (server) {{ \\ server.reload(def); @@ -180,7 +180,7 @@ pub const ServerEntryPoint = struct { \\ }} \\ }} \\ }}, reportError); - \\}} else if (typeof entryNamespace?.default?.fetch === 'function' || entryNamespace?.default?.app != undefined) {{ + \\}} else if (entryNamespace?.default !== globalThis && (typeof entryNamespace?.default?.fetch === 'function' || entryNamespace?.default?.app != undefined)) {{ \\ var server = globalThis[hmrSymbol]; \\ if (server) {{ \\ server.reload(entryNamespace.default); @@ -204,12 +204,12 @@ pub const ServerEntryPoint = struct { \\var entryNamespace = start; \\if (typeof entryNamespace?.then === 'function') {{ \\ entryNamespace = entryNamespace.then((entryNamespace) => {{ - \\ if (typeof entryNamespace?.default?.fetch === 'function') {{ + \\ if (entryNamespace?.default !== globalThis && typeof entryNamespace?.default?.fetch === 'function') {{ \\ const server = Bun.serve(entryNamespace.default); \\ console.debug(`Started ${{server.development ? 'development ' : ''}}server: ${{server.protocol}}://${{server.hostname}}:${{server.port}}`); \\ }} \\ }}, reportError); - \\}} else if (typeof entryNamespace?.default?.fetch === 'function' || entryNamespace?.default?.app != null) {{ + \\}} else if (entryNamespace?.default !== globalThis && (typeof entryNamespace?.default?.fetch === 'function' || entryNamespace?.default?.app != null)) {{ \\ const server = Bun.serve(entryNamespace.default); \\ console.debug(`Started ${{server.development ? 'development ' : ''}}server: ${{server.protocol}}://${{server.hostname}}:${{server.port}}`); \\}} diff --git a/test/regression/issue/440.test.ts b/test/regression/issue/440.test.ts new file mode 100644 index 0000000000..4a915e903c --- /dev/null +++ b/test/regression/issue/440.test.ts @@ -0,0 +1,46 @@ +import { expect, test } from "bun:test"; +import { bunEnv, bunExe, tempDir } from "harness"; + +test("exporting globalThis should not start a server", async () => { + using dir = tempDir("issue-440", { + "test.js": `module.exports = globalThis;`, + }); + + await using proc = Bun.spawn({ + cmd: [bunExe(), "test.js"], + env: bunEnv, + cwd: String(dir), + stdout: "pipe", + stderr: "pipe", + }); + + const [stdout, stderr, exitCode] = await Promise.all([proc.stdout.text(), proc.stderr.text(), proc.exited]); + + // Should NOT contain server started message + expect(stderr).not.toContain("Started"); + expect(stderr).not.toContain("server:"); + expect(stdout).toBe(""); + expect(exitCode).toBe(0); +}); + +test("default export of globalThis should not start a server", async () => { + using dir = tempDir("issue-440-esm", { + "test.js": `export default globalThis;`, + }); + + await using proc = Bun.spawn({ + cmd: [bunExe(), "test.js"], + env: bunEnv, + cwd: String(dir), + stdout: "pipe", + stderr: "pipe", + }); + + const [stdout, stderr, exitCode] = await Promise.all([proc.stdout.text(), proc.stderr.text(), proc.exited]); + + // Should NOT contain server started message + expect(stderr).not.toContain("Started"); + expect(stderr).not.toContain("server:"); + expect(stdout).toBe(""); + expect(exitCode).toBe(0); +});