fix(loader): fix agressive cjs-esm transform breaks require

cordiverse · May 31, 2024 · 531ef2b · 531ef2b
1 parent c9c6b3a
commit 531ef2b
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/packages/loader/src/index.ts b/packages/loader/src/index.ts
@@ -51,14 +51,20 @@ class NodeLoader extends Loader {
     const originalLoad: ModuleLoad = Module['_load']
     Module['_load'] = ((request, parent, isMain) => {
       try {
-        // TODO support hmr for cjs-esm interop
-        const result = this.internal?.resolveSync(request, pathToFileURL(parent.filename).href, {})
-        const job = result?.format === 'module'
-          ? this.internal?.loadCache.get(result.url)
-          : undefined
-        if (job) return job?.module?.getNamespace()
-      } catch {}
-      return originalLoad(request, parent, isMain)
+        return originalLoad(request, parent, isMain)
+      } catch (e: any) {
+        if (e.code !== 'ERR_REQUIRE_ESM' || !this.internal) throw e
+        try {
+          // TODO support hmr for cjs-esm interop
+          const result = this.internal.resolveSync(request, pathToFileURL(parent.filename).href, {})
+          const job = result?.format === 'module'
+            ? this.internal.loadCache.get(result.url)
+            : undefined
+          if (job) return job?.module?.getNamespace()
+        } catch {
+          throw e
+        }
+      }
     }) as ModuleLoad
 
     await super.start()