Fixes oven-sh#2895

apollohuang1 · May 16, 2023 · 3adadff · 3adadff
1 parent 366eba7
commit 3adadff
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/bundler/entry_points.zig b/src/bundler/entry_points.zig
@@ -190,9 +190,9 @@ pub const ServerEntryPoint = struct {
                     \\export * from '{s}{s}';
                     \\var entryNamespace = start;
                     \\var cjs = start?.default;
-                    \\if (cjs && cjsSymbol in cjs) {{
+                    \\if (cjs && typeof cjs ===  'function' && cjsSymbol in cjs) {{
                     \\  // if you module.exports = (class {{}}), don't call it
-                    \\  entryNamespace = import.meta.primordials.isCallable(cjs) ? cjs() : cjs;
+                    \\  entryNamespace = ("prototype" in cjs) ? cjs : cjs();
                     \\}}
                     \\if (typeof entryNamespace?.then === 'function') {{
                     \\   entryNamespace = entryNamespace.then((entryNamespace) => {{
@@ -233,9 +233,9 @@ pub const ServerEntryPoint = struct {
                 \\export * from '{s}{s}';
                 \\var entryNamespace = start;
                 \\var cjs = start?.default;
-                \\if (cjs && cjsSymbol in cjs) {{
+                \\if (cjs && typeof cjs ===  'function' && cjsSymbol in cjs) {{
                 \\  // if you module.exports = (class {{}}), don't call it
-                \\  entryNamespace = import.meta.primordials.isCallable(cjs) ? cjs() : cjs;
+                \\  entryNamespace = ("prototype" in cjs) ? cjs : cjs();
                 \\}}
                 \\if (typeof entryNamespace?.then === 'function') {{
                 \\   entryNamespace = entryNamespace.then((entryNamespace) => {{