Skip to content

Commit beed86f

Browse files
committed
module: add findPackageJSON util
nodejs/node#55412
1 parent fed0aec commit beed86f

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
@@ -46,19 +46,18 @@ index 5ba13096b98047ff33e4d44167c2a069ccc5e69d..a00b5979e3b5deb4ba315b4635c7e5d2
4646
}
4747
}
4848
diff --git a/lib/internal/modules/esm/resolve.js b/lib/internal/modules/esm/resolve.js
49-
index 61c043e35c6ce9ef9d7255e009162289e80eaf4d..0c41492aa9652112df0b839361570a832daf3b13 100644
49+
index bfd9bd3d127404de1cbb6f30c43ab0342590759d..9e7d8ef0adef3b68a3ec186e4b218f591aa69266 100644
5050
--- a/lib/internal/modules/esm/resolve.js
5151
+++ b/lib/internal/modules/esm/resolve.js
52-
@@ -791,6 +791,8 @@ function parsePackageName(specifier, base) {
53-
return { packageName, packageSubpath, isScoped };
52+
@@ -751,6 +751,7 @@ function packageImportsResolve(name, base, conditions) {
53+
throw importNotDefined(name, packageJSONUrl, base);
5454
}
5555

5656
+const electronTypes = ['electron', 'electron/main', 'electron/common', 'electron/renderer'];
57-
+
57+
5858
/**
5959
* Resolves a package specifier to a URL.
60-
* @param {string} specifier - The package specifier to resolve.
61-
@@ -804,6 +806,11 @@ function packageResolve(specifier, base, conditions) {
60+
@@ -765,6 +766,11 @@ function packageResolve(specifier, base, conditions) {
6261
return new URL('node:' + specifier);
6362
}
6463

@@ -67,9 +66,10 @@ index 61c043e35c6ce9ef9d7255e009162289e80eaf4d..0c41492aa9652112df0b839361570a83
6766
+ return new URL('electron:electron');
6867
+ }
6968
+
70-
const { packageName, packageSubpath, isScoped } =
71-
parsePackageName(specifier, base);
69+
const { packageJSONUrl, packageJSONPath, packageSubpath } = packageJsonReader.getPackageJSONURL(specifier, base);
7270

71+
const packageConfig = packageJsonReader.read(packageJSONPath, { __proto__: null, specifier, base, isESM: true });
72+
7373
diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
7474
index 491dc3f450733a9181096a145cfa508767682658..23ed971daebdda3cb627907ffa3626daaa5b5b7b 100644
7575
--- a/lib/internal/modules/esm/translators.js

0 commit comments

Comments
 (0)