2023-07-27 05:10:58 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Samuel Attard <marshallofsound@electronjs.org>
|
|
|
|
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
|
|
|
|
|
2023-12-11 20:09:50 +00:00
|
|
|
diff --git a/lib/internal/modules/esm/load.js b/lib/internal/modules/esm/load.js
|
2024-01-18 21:16:45 +00:00
|
|
|
index 449131b9af99744c08d62d73f8d124cef5c9cc71..3df06eff63106aece1009d88fd01df2abdf6d943 100644
|
2023-12-11 20:09:50 +00:00
|
|
|
--- a/lib/internal/modules/esm/load.js
|
|
|
|
+++ b/lib/internal/modules/esm/load.js
|
2024-01-18 21:16:45 +00:00
|
|
|
@@ -132,7 +132,7 @@ async function defaultLoad(url, context = kEmptyObject) {
|
|
|
|
source = null;
|
2023-12-11 20:09:50 +00:00
|
|
|
format ??= 'builtin';
|
2024-01-18 21:16:45 +00:00
|
|
|
} else if (format !== 'commonjs' || defaultType === 'module') {
|
2023-12-11 20:09:50 +00:00
|
|
|
- if (source == null) {
|
|
|
|
+ if (format !== 'electron' && source == null) {
|
|
|
|
({ responseURL, source } = await getSource(urlInstance, context));
|
2024-01-18 21:16:45 +00:00
|
|
|
context = { __proto__: context, source };
|
2023-12-11 20:09:50 +00:00
|
|
|
}
|
2023-11-30 14:51:35 +00:00
|
|
|
diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
|
2024-01-18 21:16:45 +00:00
|
|
|
index cea066d1073a31573e134d584f1991e7a06b1036..2b2d8e00e7ecf2e8266218d8dc5e65f0f7c8a49f 100644
|
2023-11-30 14:51:35 +00:00
|
|
|
--- a/lib/internal/modules/esm/translators.js
|
|
|
|
+++ b/lib/internal/modules/esm/translators.js
|
2024-01-18 21:16:45 +00:00
|
|
|
@@ -387,6 +387,9 @@ function cjsPreparseModuleExports(filename, source) {
|
2023-12-11 20:09:50 +00:00
|
|
|
if (cached) {
|
2023-11-30 14:51:35 +00:00
|
|
|
return { module, exportNames: cached.exportNames };
|
2023-12-11 20:09:50 +00:00
|
|
|
}
|
|
|
|
+ if (filename === 'electron') {
|
|
|
|
+ return { module, exportNames: new SafeSet(['default', ...Object.keys(module.exports)]) };
|
|
|
|
+ }
|
2023-11-30 14:51:35 +00:00
|
|
|
}
|
|
|
|
const loaded = Boolean(module);
|
|
|
|
if (!loaded) {
|
2023-07-27 05:10:58 +00:00
|
|
|
diff --git a/lib/internal/modules/run_main.js b/lib/internal/modules/run_main.js
|
2023-12-11 20:09:50 +00:00
|
|
|
index 1f03c313121db054ff824d07e57c57c749005497..2c8aa6461497f39062ec350ef8a063b9b0ac1edf 100644
|
2023-07-27 05:10:58 +00:00
|
|
|
--- a/lib/internal/modules/run_main.js
|
|
|
|
+++ b/lib/internal/modules/run_main.js
|
2023-12-11 20:09:50 +00:00
|
|
|
@@ -2,6 +2,7 @@
|
2023-11-30 14:51:35 +00:00
|
|
|
|
2023-08-09 07:32:00 +00:00
|
|
|
const {
|
|
|
|
StringPrototypeEndsWith,
|
|
|
|
+ StringPrototypeStartsWith,
|
|
|
|
} = primordials;
|
2023-11-30 14:51:35 +00:00
|
|
|
|
2023-12-11 20:09:50 +00:00
|
|
|
const { containsModuleSyntax } = internalBinding('contextify');
|
|
|
|
@@ -13,6 +14,13 @@ const path = require('path');
|
|
|
|
* @param {string} main - Entry point path
|
|
|
|
*/
|
2023-07-27 05:10:58 +00:00
|
|
|
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
|
2023-08-09 07:32:00 +00:00
|
|
|
+ if (typeof main === 'string' && StringPrototypeStartsWith(main, 'electron/js2c')) {
|
2023-07-27 05:10:58 +00:00
|
|
|
+ return main;
|
|
|
|
+ }
|
2023-12-11 20:09:50 +00:00
|
|
|
+
|
|
|
|
const defaultType = getOptionValue('--experimental-default-type');
|
|
|
|
/** @type {string} */
|
|
|
|
let mainPath;
|
|
|
|
@@ -50,6 +58,13 @@ function resolveMainPath(main) {
|
|
|
|
* @param {string} mainPath - Absolute path to the main entry point
|
|
|
|
*/
|
2023-08-09 07:32:00 +00:00
|
|
|
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;
|
|
|
|
+ }
|
2023-12-11 20:09:50 +00:00
|
|
|
+
|
|
|
|
if (getOptionValue('--experimental-default-type') === 'module') { return true; }
|
|
|
|
|
2023-08-09 07:32:00 +00:00
|
|
|
/**
|