From b980d1bd6bc2f6dc81858a5a1e014cfff67fd8c1 Mon Sep 17 00:00:00 2001 From: Electron Bot Date: Wed, 23 Sep 2020 19:24:34 -0700 Subject: [PATCH] chore: bump node in DEPS to v14.12.0 (#25593) --- DEPS | 2 +- patches/node/build_add_gn_build_files.patch | 2 +- ...non_context-aware_native_modules_being_loaded.patch | 10 +++++----- patches/node/make_module_globalpaths_a_reference.patch | 2 +- patches/node/pass_all_globals_through_require.patch | 2 +- ...llow_embedder_overriding_of_internal_fs_calls.patch | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/DEPS b/DEPS index 913c206729b..ef100f59b36 100644 --- a/DEPS +++ b/DEPS @@ -16,7 +16,7 @@ vars = { 'chromium_version': 'b943d006a33ec5bc1743792d64724693eb357083', 'node_version': - 'v14.11.0', + 'v14.12.0', 'nan_version': '2c4ee8a32a299eada3cd6e468bbd0a473bfea96d', 'squirrel.mac_version': diff --git a/patches/node/build_add_gn_build_files.patch b/patches/node/build_add_gn_build_files.patch index b9d779ee170..59ae5974151 100644 --- a/patches/node/build_add_gn_build_files.patch +++ b/patches/node/build_add_gn_build_files.patch @@ -1582,7 +1582,7 @@ index 0000000000000000000000000000000000000000..f3c5c798c0aefcb8cf9b1570a7b4817c + args = rebase_path(inputs + outputs, root_build_dir) +} diff --git a/src/node_version.h b/src/node_version.h -index 0d7ffd57452c95c2f1008ffe6ff74a46342974b7..28000c9629496ef79433fa4041a1c6ef54e09f8c 100644 +index 42b53f309ebf86acacad968fc68c991ab7fc66cc..ca3b32a34b90bc8831fe10c90e503a82e39a85b7 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -89,7 +89,10 @@ diff --git a/patches/node/chore_prevent_warn_non_context-aware_native_modules_being_loaded.patch b/patches/node/chore_prevent_warn_non_context-aware_native_modules_being_loaded.patch index 96986a4dd18..8a1667c85a8 100644 --- a/patches/node/chore_prevent_warn_non_context-aware_native_modules_being_loaded.patch +++ b/patches/node/chore_prevent_warn_non_context-aware_native_modules_being_loaded.patch @@ -29,7 +29,7 @@ index f947c6bf27e80c534a8f72265d0139a8b5b3f13a..d7e56d9c3fe5a56897989915984cb823 // 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 7067737952a5002899071bb4a434a93ec92103ce..3430cac5bb858c9abfe094b458f590096fc36dce 100644 +index c614adc508c37b7f8250d53a6e113a973008933c..99e1258b8e2939bdc0fa8881fa15b642ef352384 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -1050,6 +1050,13 @@ Module.prototype._compile = function(content, filename) { @@ -113,10 +113,10 @@ index ca5a01f925a2ae69ba4295d82316e546f45c60cd..928afa04f4312db23ef4de8c32e07057 } mp->nm_dso_handle = dlib->handle_; diff --git a/src/node_options.cc b/src/node_options.cc -index 2854ec072bf1c68810373c61673269f86fad442b..7319d7ec4541211571f0e60d94d0d28788f0631b 100644 +index 87f547da1de1c4b0d5913f0af461ee229b18aa02..c12ec1d13864b1aca227aa06b75339c14ebc5b4e 100644 --- a/src/node_options.cc +++ b/src/node_options.cc -@@ -386,6 +386,10 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() { +@@ -371,6 +371,10 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() { "disable loading non-context-aware addons", &EnvironmentOptions::force_context_aware, kAllowedInEnvironment); @@ -128,10 +128,10 @@ index 2854ec072bf1c68810373c61673269f86fad442b..7319d7ec4541211571f0e60d94d0d287 "emit pending deprecation warnings", &EnvironmentOptions::pending_deprecation, diff --git a/src/node_options.h b/src/node_options.h -index 3258d4b3f0df0c57b055c652d3391c2196ad5075..734e80aa7d35235ffe503056e14205b94f807d60 100644 +index bd63fcb0485c77e24becdf2392c453f3b2c4cdba..2af8f82ec5e6995b9ba340fddbc4943f0374198f 100644 --- a/src/node_options.h +++ b/src/node_options.h -@@ -122,6 +122,7 @@ class EnvironmentOptions : public Options { +@@ -121,6 +121,7 @@ class EnvironmentOptions : public Options { bool no_force_async_hooks_checks = false; bool no_warnings = false; bool force_context_aware = false; diff --git a/patches/node/make_module_globalpaths_a_reference.patch b/patches/node/make_module_globalpaths_a_reference.patch index cd7b25f8aef..9aae283a4ae 100644 --- a/patches/node/make_module_globalpaths_a_reference.patch +++ b/patches/node/make_module_globalpaths_a_reference.patch @@ -10,7 +10,7 @@ node's module code. (cherry picked from commit 76ba048c37588ee32636817fa7b8dffc64330cbf) diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js -index 0f8647a5f2299237a1c61dc30bd3ff5c391d69fc..efe537fca514c3d558527c9f4fc8ebb8a4de367c 100644 +index 99e0bdc5084ee81b690451b7c0b22ae3c445f1c0..f32af0aa2f4c10047d54cd9d3558f00a13257a24 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -1199,8 +1199,8 @@ Module._initPaths = function() { diff --git a/patches/node/pass_all_globals_through_require.patch b/patches/node/pass_all_globals_through_require.patch index dc9407a98b9..fcc8a22757d 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 efe537fca514c3d558527c9f4fc8ebb8a4de367c..edd5972002d7ad4d6932dfbed591a96d5b3f6fab 100644 +index f32af0aa2f4c10047d54cd9d3558f00a13257a24..922dd136f655e9ef3b6812964146789b0a372ac4 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -106,6 +106,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 2df9319ee5f..0732b07a3a2 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 6d6ca2af629c41df68fe1a4652cf94fef30be038..e1f70addc28e4fe31d3a7089ecec3b58 process.config = JSONParse(internalBinding('native_module').config); require('internal/worker/js_transferable').setup(); diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js -index edd5972002d7ad4d6932dfbed591a96d5b3f6fab..7067737952a5002899071bb4a434a93ec92103ce 100644 +index 922dd136f655e9ef3b6812964146789b0a372ac4..c614adc508c37b7f8250d53a6e113a973008933c 100644 --- a/lib/internal/modules/cjs/loader.js +++ b/lib/internal/modules/cjs/loader.js @@ -67,7 +67,7 @@ const internalFS = require('internal/fs/utils');