Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit96a77e5

Browse files
committed
module: make CJS load from ESM loader
nodejs/node#47999
1 parente9959f4 commit96a77e5

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

‎patches/node/fix_expose_the_built-in_electron_module_via_the_esm_loader.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,22 @@ index 7006887a6fe2bab525e52c6b0c76b5d089699a14..a93d93b3c2aae3ef790ffa4f417d50b8
6363
parsePackageName(specifier, base);
6464

6565
diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
66-
indexa425749e82acd7593c9fb1ceffedc119a4e416f2..1ceb89da21610c703f4a18be5888373c7feaa370 100644
66+
indexb143cd0ad34d0e039db3e7493be00d923cc68b2d..4020813f061d85ee27d50b938825319ab455c311 100644
6767
--- a/lib/internal/modules/esm/translators.js
6868
+++ b/lib/internal/modules/esm/translators.js
69-
@@ -154,7 +154,7 @@translators.set('commonjs', asyncfunctioncommonjsStrategy(url, source,
69+
@@ -220,7 +220,7 @@ functioncreateCJSModuleWrap(url, source, isMain, loadCJS = loadCJSModule) {
7070

71-
if (!cjsParse) await initCJSParse();
72-
const { module, exportNames } = cjsPreparseModuleExports(filename);
71+
const { exportNames, module } = cjsPreparseModuleExports(filename, source);
72+
cjsCache.set(url, module);
7373
- const namesWithDefault = exportNames.has('default') ?
7474
+ const namesWithDefault = filename === 'electron' ? ['default', ...Object.keys(module.exports)] : exportNames.has('default') ?
7575
[...exportNames] : ['default', ...exportNames];
7676

77-
return new ModuleWrap(url, undefined, namesWithDefault, function() {
78-
@@ -173,9 +173,9 @@ translators.set('commonjs', async function commonjsStrategy(url, source,
79-
}
77+
if (isMain) {
78+
@@ -241,9 +241,9 @@ function createCJSModuleWrap(url, source, isMain, loadCJS = loadCJSModule) {
79+
} else {
80+
({ exports } = module);
8081
}
81-
8282
- for (const exportName of exportNames) {
8383
- if (!ObjectPrototypeHasOwnProperty(exports, exportName) ||
8484
- exportName === 'default')

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp