From c2a77cf7ec9de9eadf938046bdf78e58561c8a6d Mon Sep 17 00:00:00 2001
From: dave caruso <me@paperdave.net>
Date: Wed, 2 Aug 2023 16:27:36 -0700
Subject: Rewrite built-in modules to use CommonJS over ESM (#3814)

* stfdsafsd

sadffdsa

stuff

finish commonjs stuff

asdf

not done but work

not done but work

not done yet but this is how far i am

remove files

lol

update built files

uncomment everything in events lol

export default

stuff

* afdsafsd

* its not perfect but almost done

* okay

* cool

* remove temp file

* finish rebase

* revert settings.json

* a

* ch-ch-ch-ch-changes

* okay

* remove this check in release for now

* sxdcfghnjm,

* lkjhgf

* fmt

* filename can be null

* Update NodeModuleModule.h

* weee

* fmt

---------

Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
---
 src/js/builtins/ImportMetaObject.ts | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'src/js/builtins/ImportMetaObject.ts')

diff --git a/src/js/builtins/ImportMetaObject.ts b/src/js/builtins/ImportMetaObject.ts
index 4a08524c6..9409bb0f1 100644
--- a/src/js/builtins/ImportMetaObject.ts
+++ b/src/js/builtins/ImportMetaObject.ts
@@ -103,11 +103,6 @@ export function requireESM(this: ImportMetaObject, resolved) {
     throw new TypeError(`require() failed to evaluate module "${resolved}". This is an internal consistentency error.`);
   }
   var exports = Loader.getModuleNamespaceObject(entry.module);
-  if (exports[$commonJSSymbol] === 0) {
-    // CommonJS module created via `Bun::CommonJSModuleRecord`
-    // We will refer to the requireMap to get the exports
-    return;
-  }
 
   return exports;
 }
@@ -141,10 +136,6 @@ export function internalRequire(this: ImportMetaObject, id) {
     if (cachedModule) {
       return cachedModule.exports;
     }
-    var defaultExport = exports?.default;
-    if (defaultExport?.[$commonJSSymbol] === 0) {
-      exports = defaultExport;
-    }
     $requireMap.$set(id, $createCommonJSModule(id, exports, true));
     return exports;
   }
@@ -161,9 +152,7 @@ export function createRequireCache() {
       const esm = Loader.registry.$get(key);
       if (esm?.evaluated) {
         const namespace = Loader.getModuleNamespaceObject(esm.module);
-        const exports =
-          namespace[$commonJSSymbol] === 0 || namespace.default?.[$commonJSSymbol] ? namespace.default : namespace;
-        const mod = $createCommonJSModule(key, exports, true);
+        const mod = $createCommonJSModule(key, namespace, true);
         $requireMap.$set(key, mod);
         return mod;
       }
-- 
cgit v1.2.3