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 c9d4a3536d0f60375ae623b48ca2fa7095c88d42..d818320fbbc430d06a0c2852e4723981d6e1a844 100644
- --- a/lib/internal/modules/esm/load.js
- +++ b/lib/internal/modules/esm/load.js
- @@ -109,7 +109,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 0f138b1099b4833176e8a0ce681c745422efc24a..c7dd203e4bd5d611186300d9c0f2255afdf81684 100644
- --- a/lib/internal/modules/esm/translators.js
- +++ b/lib/internal/modules/esm/translators.js
- @@ -287,6 +287,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 ab4783a7982b9feb8fa85b62e3e3b181f93309bd..34f91026451d7347ae278712d083e4fe281e50f3 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;
- @@ -62,6 +70,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; }
-
- /**
|