From 476b829eee9a63d8707ad427c047bd0ff5a19aea Mon Sep 17 00:00:00 2001 From: "electron-roller[bot]" <84116207+electron-roller[bot]@users.noreply.github.com> Date: Mon, 25 Oct 2021 13:33:01 -0400 Subject: [PATCH] chore: bump node to v16.12.0 (main) (#31518) * chore: bump node in DEPS to v16.12.0 * chore: update patches * esm: consolidate ESM Loader methods https://github.com/nodejs/node/pull/37468 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr --- DEPS | 2 +- ..._options_from_env_option_to_disable_node_options.patch | 4 ++-- patches/node/build_add_gn_build_files.patch | 6 +++--- ...allow_the_node_entrypoint_to_be_a_builtin_module.patch | 2 +- ...eat_add_flags_for_low-level_hooks_and_exceptions.patch | 8 ++++---- patches/node/pass_all_globals_through_require.patch | 2 +- ...r_allow_embedder_overriding_of_internal_fs_calls.patch | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/DEPS b/DEPS index bc2a8df92e994..b18dfccd15cf9 100644 --- a/DEPS +++ b/DEPS @@ -17,7 +17,7 @@ vars = { 'chromium_version': '96.0.4664.4', 'node_version': - 'v16.11.1', + 'v16.12.0', 'nan_version': # The following commit hash of NAN is v2.14.2 with *only* changes to the # test suite. This should be updated to a specific tag when one becomes diff --git a/patches/node/add_should_read_node_options_from_env_option_to_disable_node_options.patch b/patches/node/add_should_read_node_options_from_env_option_to_disable_node_options.patch index 0ed8af06f82df..b039b541e891a 100644 --- a/patches/node/add_should_read_node_options_from_env_option_to_disable_node_options.patch +++ b/patches/node/add_should_read_node_options_from_env_option_to_disable_node_options.patch @@ -34,10 +34,10 @@ index e0deca497feb111622b257b952c9ed9161c7d001..ab8334bf0e3405fee4d21a4b541bd116 inline std::vector* destroy_async_id_list(); diff --git a/src/node.cc b/src/node.cc -index 788e61645a281197cb3a1f3acbae427ddae1ab23..5afd3541d52d275d55067ddb1c11a585214eff41 100644 +index 207a95d202b4e422a39f837241f1655f7111b1e3..14b9002dbd918b59b05d8b12c5441080695ed9f0 100644 --- a/src/node.cc +++ b/src/node.cc -@@ -882,7 +882,7 @@ int InitializeNodeWithArgs(std::vector* argv, +@@ -875,7 +875,7 @@ int InitializeNodeWithArgs(std::vector* argv, #if !defined(NODE_WITHOUT_NODE_OPTIONS) std::string node_options; diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch index da8d4329cbe81..6b69830ed0a6b 100644 --- a/patches/node/build_add_gn_build_files.patch +++ b/patches/node/build_add_gn_build_files.patch @@ -959,7 +959,7 @@ index 0000000000000000000000000000000000000000..2c9d2826c85bdd033f1df1d6188df636 +} diff --git a/filenames.json b/filenames.json new file mode 100644 -index 0000000000000000000000000000000000000000..c0b0624028fddb4f7b409f42b357fdc404d810f3 +index 0000000000000000000000000000000000000000..e2aec71226f25645b188c2c6d8f89478a4b06ae5 --- /dev/null +++ b/filenames.json @@ -0,0 +1,603 @@ @@ -1298,9 +1298,9 @@ index 0000000000000000000000000000000000000000..c0b0624028fddb4f7b409f42b357fdc4 + "lib/internal/modules/esm/translators.js", + "lib/internal/modules/esm/resolve.js", + "lib/internal/modules/esm/create_dynamic_module.js", ++ "lib/internal/modules/esm/load.js", + "lib/internal/modules/esm/module_map.js", + "lib/internal/modules/esm/get_format.js", -+ "lib/internal/modules/esm/transform_source.js", + "lib/internal/modules/esm/loader.js", + "lib/internal/modules/cjs/helpers.js", + "lib/internal/modules/cjs/loader.js", @@ -1772,7 +1772,7 @@ index 0000000000000000000000000000000000000000..d1d6b51e8c0c5bc6a5d09e217eb30483 + args = rebase_path(inputs + outputs, root_build_dir) +} diff --git a/src/node_version.h b/src/node_version.h -index 119a341d8dc5bc11c3f0db69d489ae60f4a33923..938ca353d332b3ca599b19cdc763c93a98eb8854 100644 +index 7d8e7e507b2481e1f49c8da7c75a58dc8f90640e..d8ed5d33c3cf786ba2df9d37083c1ef103e06489 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -89,7 +89,10 @@ diff --git a/patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch b/patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch index 36696089dbb63..0158ba8a35a25 100644 --- a/patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch +++ b/patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch @@ -29,7 +29,7 @@ index 9d2799c3c9ac3b216c2289ae4e037dd228844d23..5b31df1207d4417a6f9b784574e37796 // TODO(joyeecheung): most of these should be deprecated and removed, diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js -index 5d75a0e6cb9692a303be6599226f20783e7863b8..eb7f4346035f0897d0f2b140277e48b3c7bb7546 100644 +index 05a62bb3c3852536001912cb0b69fe5578ace125..37f395e9f2b7ab9ce99b0f8f4217253fcbd9175b 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -1075,6 +1075,13 @@ Module.prototype._compile = function(content, filename) { diff --git a/patches/node/feat_add_flags_for_low-level_hooks_and_exceptions.patch b/patches/node/feat_add_flags_for_low-level_hooks_and_exceptions.patch index f5ec5a9009e4d..bfe9ef5ec6ade 100644 --- a/patches/node/feat_add_flags_for_low-level_hooks_and_exceptions.patch +++ b/patches/node/feat_add_flags_for_low-level_hooks_and_exceptions.patch @@ -24,7 +24,7 @@ Environment on the V8 context of blink, so no new V8 context is created. As a result, a renderer process may have multiple Node Environments in it. diff --git a/src/node.cc b/src/node.cc -index acf4f0fac03c0ba655d55bc832a37a816ac26a33..788e61645a281197cb3a1f3acbae427ddae1ab23 100644 +index e942c108a15a3c50d92c08b344f6691050c7859d..207a95d202b4e422a39f837241f1655f7111b1e3 100644 --- a/src/node.cc +++ b/src/node.cc @@ -139,6 +139,8 @@ using v8::Undefined; @@ -36,7 +36,7 @@ index acf4f0fac03c0ba655d55bc832a37a816ac26a33..788e61645a281197cb3a1f3acbae427d namespace per_process { // node_revert.h -@@ -860,7 +862,9 @@ int InitializeNodeWithArgs(std::vector* argv, +@@ -853,7 +855,9 @@ int InitializeNodeWithArgs(std::vector* argv, binding::RegisterBuiltinModules(); // Make inherited handles noninheritable. @@ -47,7 +47,7 @@ index acf4f0fac03c0ba655d55bc832a37a816ac26a33..788e61645a281197cb3a1f3acbae427d // Cache the original command line to be // used in diagnostic reports. -@@ -894,7 +898,8 @@ int InitializeNodeWithArgs(std::vector* argv, +@@ -887,7 +891,8 @@ int InitializeNodeWithArgs(std::vector* argv, if (exit_code != 0) return exit_code; } #endif @@ -57,7 +57,7 @@ index acf4f0fac03c0ba655d55bc832a37a816ac26a33..788e61645a281197cb3a1f3acbae427d const int exit_code = ProcessGlobalArgs(argv, exec_argv, errors, -@@ -937,7 +942,7 @@ int InitializeNodeWithArgs(std::vector* argv, +@@ -930,7 +935,7 @@ int InitializeNodeWithArgs(std::vector* argv, return 9; } per_process::metadata.versions.InitializeIntlVersions(); diff --git a/patches/node/pass_all_globals_through_require.patch b/patches/node/pass_all_globals_through_require.patch index a1211d473d418..e0ef037d54b9e 100644 --- a/patches/node/pass_all_globals_through_require.patch +++ b/patches/node/pass_all_globals_through_require.patch @@ -6,7 +6,7 @@ Subject: Pass all globals through "require" (cherry picked from commit 7d015419cb7a0ecfe6728431a4ed2056cd411d62) diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js -index 3f1dac356b81f437503422a8fb69df792db9c523..dfaea25243826878afc0af96a77d0aef153fa76b 100644 +index b8eff0440624a41d89a39c46303fa51d581bf4bf..67eb7717f13379312721fc4da2e760bc08d8ed3a 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -127,6 +127,13 @@ const { diff --git a/patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch b/patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch index ea982f5be2018..1eccad9b31b62 100644 --- a/patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch +++ b/patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch @@ -22,7 +22,7 @@ index 58f7396990dddb7dd4cf3d23fcdcc1d48f52623e..ef06d0563fa7452348754418867a56c9 const nativeModule = internalBinding('native_module'); diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js -index dfaea25243826878afc0af96a77d0aef153fa76b..5d75a0e6cb9692a303be6599226f20783e7863b8 100644 +index 67eb7717f13379312721fc4da2e760bc08d8ed3a..05a62bb3c3852536001912cb0b69fe5578ace125 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -86,7 +86,7 @@ const fs = require('fs');