esm: do not call getSource when format is commonjs

codebytere · zcbenz · commit f7d5537e3cfc · 2024-01-12T11:02:12.000+09:00
nodejs/node#50465
diff --git a/patches/node/fix_do_not_resolve_electron_entrypoints.patch b/patches/node/fix_do_not_resolve_electron_entrypoints.patch
@@ -6,27 +6,18 @@ Subject: fix: do not resolve electron entrypoints
 This wastes fs cycles and can result in strange behavior if this path actually exists on disk
 
 diff --git a/lib/internal/modules/esm/load.js b/lib/internal/modules/esm/load.js
-index 8406e8ca319533d6186c5d457e951b7a845b6b72..caa34187e17d9a0addcc8c94e46823ea4e05c590 100644
+index 1d94cbeb771375243f58e544c583f612c3f4385c..97146f38a5478afeaded03c16e44ffb56fbe8087 100644
 --- a/lib/internal/modules/esm/load.js
 +++ b/lib/internal/modules/esm/load.js
-@@ -131,7 +131,7 @@ async function defaultLoad(url, context = kEmptyObject) {
+@@ -132,7 +132,7 @@ async function defaultLoad(url, context = kEmptyObject) {
+     source = null;
      format ??= 'builtin';
-   } else {
-     let contextToPass = context;
+   } else if (format !== 'commonjs' || defaultType === 'module') {
 -    if (source == null) {
 +    if (format !== 'electron' && source == null) {
        ({ responseURL, source } = await getSource(urlInstance, context));
-       contextToPass = { __proto__: context, source };
+       context = { __proto__: context, source };
      }
-@@ -139,7 +139,7 @@ async function defaultLoad(url, context = kEmptyObject) {
-     // Now that we have the source for the module, run `defaultGetFormat` again in case we detect ESM syntax.
-     format ??= await defaultGetFormat(urlInstance, contextToPass);
- 
--    if ((format === 'commonjs' || format === 'electron') && contextToPass !== context) {
-+    if (format === 'electron' || format === 'commonjs' && contextToPass !== context) {
-       // For backward compatibility reasons, we need to discard the source in
-       // order for the CJS loader to re-fetch it.
-       source = null;
 diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
 index dbbe37474c70addfbf8cf805c29732dcd38c74f6..96ffb2b0b051163d8a777ed3d1b5bc2c83fc37c5 100644
 --- a/lib/internal/modules/esm/translators.js
diff --git a/patches/node/fix_expose_the_built-in_electron_module_via_the_esm_loader.patch b/patches/node/fix_expose_the_built-in_electron_module_via_the_esm_loader.patch
@@ -26,7 +26,7 @@ index 5239bc8ed883a54df206d73c5dc0b70942c4f3df..a111b5d7a6084caa61deb56bace5d91b
        format = await defaultGetFormat(urlInstance, context);
  
 -      if (format === 'commonjs') {
-+      if (format === 'commonjs' || format === 'electron') {
++      if (format === 'electron' || format === 'commonjs') {
          // For backward compatibility reasons, we need to discard the source in
          // order for the CJS loader to re-fetch it.
          source = null;
