1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Samuel Attard <[email protected]>
- Date: Wed, 26 Jul 2023 17:03:15 -0700
- 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 463e76cb1abc0c2fdddba4db2ca2e00f7c591e12..d7bc3c35c77b5bf9ec122b38248d0cf1f4d2a548 100644
- --- a/lib/internal/modules/esm/load.js
- +++ b/lib/internal/modules/esm/load.js
- @@ -111,7 +111,7 @@ async function defaultLoad(url, context = kEmptyObject) {
- source = null;
- format ??= 'builtin';
- } else if (format !== 'commonjs' || defaultType === 'module') {
- - if (source == null) {
- + if (format !== 'electron' && source == null) {
- ({ responseURL, source } = await getSource(urlInstance, context));
- context = { __proto__: context, source };
- }
- diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
- index 06b31af80ebbfbf35ec787a94f345775eb512ebf..deca5aa4b8829ba9921440fcb5c285a10e40c8f0 100644
- --- a/lib/internal/modules/esm/translators.js
- +++ b/lib/internal/modules/esm/translators.js
- @@ -354,6 +354,9 @@ function cjsPreparseModuleExports(filename, source) {
- if (module && module[kModuleExportNames] !== undefined) {
- return { module, exportNames: module[kModuleExportNames] };
- }
- + if (filename === 'electron') {
- + return { module, exportNames: new SafeSet(['default', ...Object.keys(module.exports)]) };
- + }
- const loaded = Boolean(module);
- if (!loaded) {
- module = new CJSModule(filename);
- diff --git a/lib/internal/modules/run_main.js b/lib/internal/modules/run_main.js
- index 1e1a1ea46fc6c1b43cad4038ab0d9cdf21d6ba3d..95e2fa5479ea31559fdb5a2e03515f243b231b75 100644
- --- a/lib/internal/modules/run_main.js
- +++ b/lib/internal/modules/run_main.js
- @@ -2,6 +2,7 @@
-
- const {
- StringPrototypeEndsWith,
- + StringPrototypeStartsWith,
- globalThis,
- } = primordials;
-
- @@ -26,6 +27,13 @@ const {
- * @param {string} main - Entry point path
- */
- function resolveMainPath(main) {
- + // For built-in modules used as the main entry point we _never_
- + // want to waste cycles resolving them to file paths on disk
- + // that actually might exist
- + if (typeof main === 'string' && StringPrototypeStartsWith(main, 'electron/js2c')) {
- + return main;
- + }
- +
- const defaultType = getOptionValue('--experimental-default-type');
- /** @type {string} */
- let mainPath;
- @@ -63,6 +71,13 @@ function resolveMainPath(main) {
- * @param {string} mainPath - Absolute path to the main entry point
- */
- function shouldUseESMLoader(mainPath) {
- + // For built-in modules used as the main entry point we _never_
- + // want to waste cycles resolving them to file paths on disk
- + // that actually might exist
- + if (typeof mainPath === 'string' && StringPrototypeStartsWith(mainPath, 'electron/js2c')) {
- + return false;
- + }
- +
- if (getOptionValue('--experimental-default-type') === 'module') { return true; }
-
- /**
|