module: reduce url invocations in esm/load.js

codebytere · codebytere · commit 2e19f7fcddfb · 2023-09-19T22:28:45.000+02:00
nodejs/node#48337
diff --git a/patches/node/fix_lazyload_fs_in_esm_loaders_to_apply_asar_patches.patch b/patches/node/fix_lazyload_fs_in_esm_loaders_to_apply_asar_patches.patch
@@ -6,7 +6,7 @@ Subject: fix: lazyload fs in esm loaders to apply asar patches
 Changes { foo } from fs to just "fs.foo" so that our patching of fs is applied to esm loaders
 
 diff --git a/lib/internal/modules/esm/load.js b/lib/internal/modules/esm/load.js
-index d64d4452a50bc4469b2d2fcc3251b3df31cda6ec..8d8f1b24fb68cce2b37e43f92aac200b4ee73cea 100644
+index d8a072cf6af3b0d3a47ee69be04b26875683d261..89932f2572d09dd3383a82ccac060afbc1329071 100644
 --- a/lib/internal/modules/esm/load.js
 +++ b/lib/internal/modules/esm/load.js
 @@ -20,7 +20,7 @@ const experimentalNetworkImports =
@@ -18,14 +18,14 @@ index d64d4452a50bc4469b2d2fcc3251b3df31cda6ec..8d8f1b24fb68cce2b37e43f92aac200b
  const { URL } = require('internal/url');
  const {
    ERR_INVALID_URL,
-@@ -34,7 +34,7 @@ async function getSource(url, context) {
-   let responseURL = url;
+@@ -39,7 +39,7 @@ async function getSource(url, context) {
+   let responseURL = href;
    let source;
-   if (parsed.protocol === 'file:') {
--    source = await readFileAsync(parsed);
+   if (protocol === 'file:') {
+-    source = await readFileAsync(url);
 +    source = await fs.promises.readFile(parsed);
-   } else if (parsed.protocol === 'data:') {
-     const match = RegExpPrototypeExec(DATA_URL_PATTERN, parsed.pathname);
+   } else if (protocol === 'data:') {
+     const match = RegExpPrototypeExec(DATA_URL_PATTERN, url.pathname);
      if (!match) {
 diff --git a/lib/internal/modules/esm/resolve.js b/lib/internal/modules/esm/resolve.js
 index ce2d851da2577e6e99980eb75337f629b38fddbf..fed26d25b59d66ab6e5160e2e13c8eea0cb44f8d 100644
