Skip to content

Commit 3d66477

Browse files
electron-roller[bot]patchup[bot]codebytere
authored andcommitted
chore: bump node to v16.12.0 (main) (electron#31518)
* chore: bump node in DEPS to v16.12.0 * chore: update patches * esm: consolidate ESM Loader methods nodejs/node#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 <[email protected]>
1 parent 5f38f20 commit 3d66477

7 files changed

+13
-13
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ vars = {
1717
'chromium_version':
1818
'96.0.4664.4',
1919
'node_version':
20-
'v16.11.1',
20+
'v16.12.0',
2121
'nan_version':
2222
# The following commit hash of NAN is v2.14.2 with *only* changes to the
2323
# test suite. This should be updated to a specific tag when one becomes

patches/node/add_should_read_node_options_from_env_option_to_disable_node_options.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ index e0deca497feb111622b257b952c9ed9161c7d001..ab8334bf0e3405fee4d21a4b541bd116
3434
inline std::vector<double>* destroy_async_id_list();
3535

3636
diff --git a/src/node.cc b/src/node.cc
37-
index 788e61645a281197cb3a1f3acbae427ddae1ab23..5afd3541d52d275d55067ddb1c11a585214eff41 100644
37+
index 207a95d202b4e422a39f837241f1655f7111b1e3..14b9002dbd918b59b05d8b12c5441080695ed9f0 100644
3838
--- a/src/node.cc
3939
+++ b/src/node.cc
40-
@@ -882,7 +882,7 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
40+
@@ -875,7 +875,7 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
4141
#if !defined(NODE_WITHOUT_NODE_OPTIONS)
4242
std::string node_options;
4343

patches/node/build_add_gn_build_files.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -959,7 +959,7 @@ index 0000000000000000000000000000000000000000..2c9d2826c85bdd033f1df1d6188df636
959959
+}
960960
diff --git a/filenames.json b/filenames.json
961961
new file mode 100644
962-
index 0000000000000000000000000000000000000000..c0b0624028fddb4f7b409f42b357fdc404d810f3
962+
index 0000000000000000000000000000000000000000..e2aec71226f25645b188c2c6d8f89478a4b06ae5
963963
--- /dev/null
964964
+++ b/filenames.json
965965
@@ -0,0 +1,603 @@
@@ -1298,9 +1298,9 @@ index 0000000000000000000000000000000000000000..c0b0624028fddb4f7b409f42b357fdc4
12981298
+ "lib/internal/modules/esm/translators.js",
12991299
+ "lib/internal/modules/esm/resolve.js",
13001300
+ "lib/internal/modules/esm/create_dynamic_module.js",
1301+
+ "lib/internal/modules/esm/load.js",
13011302
+ "lib/internal/modules/esm/module_map.js",
13021303
+ "lib/internal/modules/esm/get_format.js",
1303-
+ "lib/internal/modules/esm/transform_source.js",
13041304
+ "lib/internal/modules/esm/loader.js",
13051305
+ "lib/internal/modules/cjs/helpers.js",
13061306
+ "lib/internal/modules/cjs/loader.js",
@@ -1772,7 +1772,7 @@ index 0000000000000000000000000000000000000000..d1d6b51e8c0c5bc6a5d09e217eb30483
17721772
+ args = rebase_path(inputs + outputs, root_build_dir)
17731773
+}
17741774
diff --git a/src/node_version.h b/src/node_version.h
1775-
index 119a341d8dc5bc11c3f0db69d489ae60f4a33923..938ca353d332b3ca599b19cdc763c93a98eb8854 100644
1775+
index 7d8e7e507b2481e1f49c8da7c75a58dc8f90640e..d8ed5d33c3cf786ba2df9d37083c1ef103e06489 100644
17761776
--- a/src/node_version.h
17771777
+++ b/src/node_version.h
17781778
@@ -89,7 +89,10 @@

patches/node/chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ index 9d2799c3c9ac3b216c2289ae4e037dd228844d23..5b31df1207d4417a6f9b784574e37796
2929

3030
// TODO(joyeecheung): most of these should be deprecated and removed,
3131
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
32-
index 5d75a0e6cb9692a303be6599226f20783e7863b8..eb7f4346035f0897d0f2b140277e48b3c7bb7546 100644
32+
index 05a62bb3c3852536001912cb0b69fe5578ace125..37f395e9f2b7ab9ce99b0f8f4217253fcbd9175b 100644
3333
--- a/lib/internal/modules/cjs/loader.js
3434
+++ b/lib/internal/modules/cjs/loader.js
3535
@@ -1075,6 +1075,13 @@ Module.prototype._compile = function(content, filename) {

patches/node/feat_add_flags_for_low-level_hooks_and_exceptions.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Environment on the V8 context of blink, so no new V8 context is created.
2424
As a result, a renderer process may have multiple Node Environments in it.
2525

2626
diff --git a/src/node.cc b/src/node.cc
27-
index acf4f0fac03c0ba655d55bc832a37a816ac26a33..788e61645a281197cb3a1f3acbae427ddae1ab23 100644
27+
index e942c108a15a3c50d92c08b344f6691050c7859d..207a95d202b4e422a39f837241f1655f7111b1e3 100644
2828
--- a/src/node.cc
2929
+++ b/src/node.cc
3030
@@ -139,6 +139,8 @@ using v8::Undefined;
@@ -36,7 +36,7 @@ index acf4f0fac03c0ba655d55bc832a37a816ac26a33..788e61645a281197cb3a1f3acbae427d
3636
namespace per_process {
3737

3838
// node_revert.h
39-
@@ -860,7 +862,9 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
39+
@@ -853,7 +855,9 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
4040
binding::RegisterBuiltinModules();
4141

4242
// Make inherited handles noninheritable.
@@ -47,7 +47,7 @@ index acf4f0fac03c0ba655d55bc832a37a816ac26a33..788e61645a281197cb3a1f3acbae427d
4747

4848
// Cache the original command line to be
4949
// used in diagnostic reports.
50-
@@ -894,7 +898,8 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
50+
@@ -887,7 +891,8 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
5151
if (exit_code != 0) return exit_code;
5252
}
5353
#endif
@@ -57,7 +57,7 @@ index acf4f0fac03c0ba655d55bc832a37a816ac26a33..788e61645a281197cb3a1f3acbae427d
5757
const int exit_code = ProcessGlobalArgs(argv,
5858
exec_argv,
5959
errors,
60-
@@ -937,7 +942,7 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
60+
@@ -930,7 +935,7 @@ int InitializeNodeWithArgs(std::vector<std::string>* argv,
6161
return 9;
6262
}
6363
per_process::metadata.versions.InitializeIntlVersions();

patches/node/pass_all_globals_through_require.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Subject: Pass all globals through "require"
66
(cherry picked from commit 7d015419cb7a0ecfe6728431a4ed2056cd411d62)
77

88
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
9-
index 3f1dac356b81f437503422a8fb69df792db9c523..dfaea25243826878afc0af96a77d0aef153fa76b 100644
9+
index b8eff0440624a41d89a39c46303fa51d581bf4bf..67eb7717f13379312721fc4da2e760bc08d8ed3a 100644
1010
--- a/lib/internal/modules/cjs/loader.js
1111
+++ b/lib/internal/modules/cjs/loader.js
1212
@@ -127,6 +127,13 @@ const {

patches/node/refactor_allow_embedder_overriding_of_internal_fs_calls.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ index 58f7396990dddb7dd4cf3d23fcdcc1d48f52623e..ef06d0563fa7452348754418867a56c9
2222
const nativeModule = internalBinding('native_module');
2323

2424
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
25-
index dfaea25243826878afc0af96a77d0aef153fa76b..5d75a0e6cb9692a303be6599226f20783e7863b8 100644
25+
index 67eb7717f13379312721fc4da2e760bc08d8ed3a..05a62bb3c3852536001912cb0b69fe5578ace125 100644
2626
--- a/lib/internal/modules/cjs/loader.js
2727
+++ b/lib/internal/modules/cjs/loader.js
2828
@@ -86,7 +86,7 @@ const fs = require('fs');

0 commit comments

Comments
 (0)