chore: bump node to v20.10.0 (main) (#40675)
* chore: bump node in DEPS to v20.10.0 * chore: update feat_initialize_asar_support.patch no code changes; patch just needed an update due to nearby upstream changes Xref: https://github.com/nodejs/node/pull/49986 * chore: update pass_all_globals_through_require.patch no manual changes; patch applied with fuzz Xref: https://github.com/nodejs/node/pull/49657 * chore: update refactor_allow_embedder_overriding_of_internal_fs_calls Xref: https://github.com/nodejs/node/pull/49912 no code changes; patch just needed an update due to nearby upstream changes * chore: update chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch Xref: https://github.com/nodejs/node/pull/49986 minor manual changes needed to sync with upstream change * update fix_expose_the_built-in_electron_module_via_the_esm_loader.patch Xref: https://github.com/nodejs/node/pull/50096 Xref: https://github.com/nodejs/node/pull/50314 in lib/internal/modules/esm/load.js, update the code that checks for `format === 'electron'`. I'd like 👀 on this Xref: https://github.com/nodejs/node/pull/49657 add braces in lib/internal/modules/esm/translators.js to sync with upstream * fix: lazyload fs in esm loaders to apply asar patches * https://github.com/nodejs/node/pull/50127 * https://github.com/nodejs/node/pull/50096 * esm: jsdoc for modules code https://github.com/nodejs/node/pull/49523 * test: set test-cli-node-options as flaky https://github.com/nodejs/node/pull/50296 * deps: update c-ares to 1.20.1 https://github.com/nodejs/node/pull/50082 * esm: bypass CommonJS loader under --default-type=module https://github.com/nodejs/node/pull/49986 * deps: update uvwasi to 0.0.19 https://github.com/nodejs/node/pull/49908 * lib,test: do not hardcode Buffer.kMaxLength https://github.com/nodejs/node/pull/49876 * crypto: account for disabled SharedArrayBuffer https://github.com/nodejs/node/pull/50034 * test: fix edge snapshot stack traces https://github.com/nodejs/node/pull/49659 * src: generate snapshot with --predictable https://github.com/nodejs/node/pull/48749 * chore: fixup patch indices * fs: throw errors from sync branches instead of separate implementations https://github.com/nodejs/node/pull/49913 * crypto: ensure valid point on elliptic curve in SubtleCrypto.importKey https://github.com/nodejs/node/pull/50234 * esm: detect ESM syntax in ambiguous JavaScrip https://github.com/nodejs/node/pull/50096 * fixup! test: fix edge snapshot stack traces * esm: unflag extensionless ES module JavaScript and Wasm in module scope https://github.com/nodejs/node/pull/49974 * [tagged-ptr] Arrowify objects https://chromium-review.googlesource.com/c/v8/v8/+/4705331 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
electron-roller[bot]
GitHub
parent
5094cb4115
commit
890a557eed
32 changed files with 279 additions and 599 deletions
|
|
@ -5,33 +5,57 @@ 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 8406e8ca319533d6186c5d457e951b7a845b6b72..caa34187e17d9a0addcc8c94e46823ea4e05c590 100644
|
||||
--- a/lib/internal/modules/esm/load.js
|
||||
+++ b/lib/internal/modules/esm/load.js
|
||||
@@ -131,7 +131,7 @@ async function defaultLoad(url, context = kEmptyObject) {
|
||||
format ??= 'builtin';
|
||||
} else {
|
||||
let contextToPass = context;
|
||||
- if (source == null) {
|
||||
+ if (format !== 'electron' && source == null) {
|
||||
({ responseURL, source } = await getSource(urlInstance, context));
|
||||
contextToPass = { __proto__: context, source };
|
||||
}
|
||||
@@ -139,7 +139,7 @@ async function defaultLoad(url, context = kEmptyObject) {
|
||||
// Now that we have the source for the module, run `defaultGetFormat` again in case we detect ESM syntax.
|
||||
format ??= await defaultGetFormat(urlInstance, contextToPass);
|
||||
|
||||
- if ((format === 'commonjs' || format === 'electron') && contextToPass !== context) {
|
||||
+ if (format === 'electron' || format === 'commonjs' && contextToPass !== context) {
|
||||
// For backward compatibility reasons, we need to discard the source in
|
||||
// order for the CJS loader to re-fetch it.
|
||||
source = null;
|
||||
diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
|
||||
index 4c3a0d8c484a402fe419a0bd45c7e2b1d717cb4a..b8be4cde3bbe4b14e607a2bef0a2405df3cae533 100644
|
||||
index dbbe37474c70addfbf8cf805c29732dcd38c74f6..96ffb2b0b051163d8a777ed3d1b5bc2c83fc37c5 100644
|
||||
--- a/lib/internal/modules/esm/translators.js
|
||||
+++ b/lib/internal/modules/esm/translators.js
|
||||
@@ -309,6 +309,8 @@ function cjsPreparseModuleExports(filename, source) {
|
||||
const cached = cjsParseCache.get(module);
|
||||
if (cached)
|
||||
@@ -376,6 +376,9 @@ function cjsPreparseModuleExports(filename, source) {
|
||||
if (cached) {
|
||||
return { module, exportNames: cached.exportNames };
|
||||
+ if (filename === 'electron')
|
||||
+ return { module };
|
||||
}
|
||||
+ if (filename === 'electron') {
|
||||
+ return { module, exportNames: new SafeSet(['default', ...Object.keys(module.exports)]) };
|
||||
+ }
|
||||
}
|
||||
const loaded = Boolean(module);
|
||||
if (!loaded) {
|
||||
diff --git a/lib/internal/modules/run_main.js b/lib/internal/modules/run_main.js
|
||||
index 0bfe7b11241416bfca0d470047b14777ad99307f..c86add4395ed59cee0d880961e7572b0cc3d6698 100644
|
||||
index 1f03c313121db054ff824d07e57c57c749005497..2c8aa6461497f39062ec350ef8a063b9b0ac1edf 100644
|
||||
--- a/lib/internal/modules/run_main.js
|
||||
+++ b/lib/internal/modules/run_main.js
|
||||
@@ -2,12 +2,19 @@
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
const {
|
||||
StringPrototypeEndsWith,
|
||||
+ StringPrototypeStartsWith,
|
||||
} = primordials;
|
||||
|
||||
const { getOptionValue } = require('internal/options');
|
||||
const path = require('path');
|
||||
|
||||
const { containsModuleSyntax } = internalBinding('contextify');
|
||||
@@ -13,6 +14,13 @@ const path = require('path');
|
||||
* @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
|
||||
|
|
@ -39,12 +63,13 @@ index 0bfe7b11241416bfca0d470047b14777ad99307f..c86add4395ed59cee0d880961e7572b0
|
|||
+ if (typeof main === 'string' && StringPrototypeStartsWith(main, 'electron/js2c')) {
|
||||
+ return main;
|
||||
+ }
|
||||
// Note extension resolution for the main entry point can be deprecated in a
|
||||
// future major.
|
||||
// Module._findPath is monkey-patchable here.
|
||||
@@ -24,6 +31,12 @@ function resolveMainPath(main) {
|
||||
}
|
||||
|
||||
+
|
||||
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
|
||||
*/
|
||||
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
|
||||
|
|
@ -52,6 +77,7 @@ index 0bfe7b11241416bfca0d470047b14777ad99307f..c86add4395ed59cee0d880961e7572b0
|
|||
+ if (typeof mainPath === 'string' && StringPrototypeStartsWith(mainPath, 'electron/js2c')) {
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
if (getOptionValue('--experimental-default-type') === 'module') { return true; }
|
||||
|
||||
/**
|
||||
* @type {string[]} userLoaders A list of custom loaders registered by the user
|
||||
* (or an empty list when none have been registered).
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue