chore: bump node to v12.18.2 (master) (#24381)

* chore: bump node in DEPS to v12.18.2

* update patches

Co-authored-by: Electron Bot <anonymous@electronjs.org>
This commit is contained in:
Electron Bot 2020-07-01 12:39:35 -07:00 committed by GitHub
parent 354ea00f17
commit c157311373
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 12 deletions

2
DEPS
View file

@ -15,7 +15,7 @@ vars = {
'chromium_version': 'chromium_version':
'9ae03ef8f7d4f6ac663f725bcfe70311987652f3', '9ae03ef8f7d4f6ac663f725bcfe70311987652f3',
'node_version': 'node_version':
'v12.18.1', 'v12.18.2',
'nan_version': 'nan_version':
'2c4ee8a32a299eada3cd6e468bbd0a473bfea96d', '2c4ee8a32a299eada3cd6e468bbd0a473bfea96d',

View file

@ -1593,7 +1593,7 @@ index 0000000000000000000000000000000000000000..f3c5c798c0aefcb8cf9b1570a7b4817c
+ args = rebase_path(inputs + outputs, root_build_dir) + args = rebase_path(inputs + outputs, root_build_dir)
+} +}
diff --git a/src/node_version.h b/src/node_version.h diff --git a/src/node_version.h b/src/node_version.h
index 3d9276b8c92ad49681147b809a276c8157907b5e..2cc9fa91bf20bbde278e5d333ca485c0c159504e 100644 index a43e451ab0cd5f2bc24453d5821deb380d2ab6d0..190479619f188bd05d1faac4696670fe18425a53 100644
--- a/src/node_version.h --- a/src/node_version.h
+++ b/src/node_version.h +++ b/src/node_version.h
@@ -89,7 +89,10 @@ @@ -89,7 +89,10 @@

View file

@ -10,7 +10,7 @@ THe fix for this should land in node-gyp as discussed in above issue,
landing this as temporary patch. landing this as temporary patch.
diff --git a/common.gypi b/common.gypi diff --git a/common.gypi b/common.gypi
index 344466dd249323768541ae8c6c2800795845eea8..572597ef60c13dfc332c7da49b606867f0561c54 100644 index df69aecc74ef66b9501d4bed0e1311e7cda2d5b8..dfcf529cd501dc890c05425fcf9a33414a45f1a5 100644
--- a/common.gypi --- a/common.gypi
+++ b/common.gypi +++ b/common.gypi
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@

View file

@ -41,10 +41,10 @@ index e478c57af873da717c00db73d6719f806280efe1..1c949cab49224a6f1be7685acfd3ed19
try { try {
resolvedArgv = Module._resolveFilename(process.argv[1], null, false); resolvedArgv = Module._resolveFilename(process.argv[1], null, false);
diff --git a/src/env.h b/src/env.h diff --git a/src/env.h b/src/env.h
index c1fda87ecd536f2347f5011414932ec79aebfc60..12ba5b69369e858ee9e743ef06059d6cd5541078 100644 index 6de5ba9b192dd1ec23afe7a7736373acb59a6c4e..b6e02a2910cd8fe5ff3a17d6e1a98b937323ae3a 100644
--- a/src/env.h --- a/src/env.h
+++ b/src/env.h +++ b/src/env.h
@@ -888,6 +888,15 @@ class Environment : public MemoryRetainer { @@ -890,6 +890,15 @@ class Environment : public MemoryRetainer {
uint64_t thread_id = kNoThreadId); uint64_t thread_id = kNoThreadId);
~Environment() override; ~Environment() override;
@ -60,7 +60,7 @@ index c1fda87ecd536f2347f5011414932ec79aebfc60..12ba5b69369e858ee9e743ef06059d6c
void InitializeLibuv(bool start_profiler_idle_notifier); void InitializeLibuv(bool start_profiler_idle_notifier);
inline const std::vector<std::string>& exec_argv(); inline const std::vector<std::string>& exec_argv();
inline const std::vector<std::string>& argv(); inline const std::vector<std::string>& argv();
@@ -1271,6 +1280,9 @@ class Environment : public MemoryRetainer { @@ -1273,6 +1282,9 @@ class Environment : public MemoryRetainer {
inline void ThrowError(v8::Local<v8::Value> (*fun)(v8::Local<v8::String>), inline void ThrowError(v8::Local<v8::Value> (*fun)(v8::Local<v8::String>),
const char* errmsg); const char* errmsg);

View file

@ -108,10 +108,10 @@ index c56a25f31e42aaf8bcbc0e3bb3db4f7aad0cf124..58f2372d664c4c6f8a513cb4206c2494
void BaseObject::DeleteMe(void* data) { void BaseObject::DeleteMe(void* data) {
BaseObject* self = static_cast<BaseObject*>(data); BaseObject* self = static_cast<BaseObject*>(data);
diff --git a/src/env.h b/src/env.h diff --git a/src/env.h b/src/env.h
index 12ba5b69369e858ee9e743ef06059d6cd5541078..b0b9b17dd6684c10139435b85e8724e31ad4d92c 100644 index b6e02a2910cd8fe5ff3a17d6e1a98b937323ae3a..c1966a9f55126bdd65d8c9d529d934977bb4ad65 100644
--- a/src/env.h --- a/src/env.h
+++ b/src/env.h +++ b/src/env.h
@@ -1130,9 +1130,7 @@ class Environment : public MemoryRetainer { @@ -1132,9 +1132,7 @@ class Environment : public MemoryRetainer {
void AtExit(void (*cb)(void* arg), void* arg); void AtExit(void (*cb)(void* arg), void* arg);
void RunAtExitCallbacks(); void RunAtExitCallbacks();
@ -121,7 +121,7 @@ index 12ba5b69369e858ee9e743ef06059d6cd5541078..b0b9b17dd6684c10139435b85e8724e3
// Strings and private symbols are shared across shared contexts // Strings and private symbols are shared across shared contexts
// The getters simply proxy to the per-isolate primitive. // The getters simply proxy to the per-isolate primitive.
@@ -1355,8 +1353,6 @@ class Environment : public MemoryRetainer { @@ -1357,8 +1355,6 @@ class Environment : public MemoryRetainer {
uint64_t thread_id_; uint64_t thread_id_;
std::unordered_set<worker::Worker*> sub_worker_contexts_; std::unordered_set<worker::Worker*> sub_worker_contexts_;

View file

@ -8,7 +8,7 @@ node modules will have different (wrong) ideas about how v8 structs are laid
out in memory on 64-bit machines, and will summarily fail to work. out in memory on 64-bit machines, and will summarily fail to work.
diff --git a/common.gypi b/common.gypi diff --git a/common.gypi b/common.gypi
index 572597ef60c13dfc332c7da49b606867f0561c54..db8dc7452552beb6a758d1b6175bd402b6a09d24 100644 index dfcf529cd501dc890c05425fcf9a33414a45f1a5..38e7b2802f6225ac0e1ff4789b9ff8f4fb04cb79 100644
--- a/common.gypi --- a/common.gypi
+++ b/common.gypi +++ b/common.gypi
@@ -71,6 +71,9 @@ @@ -71,6 +71,9 @@

View file

@ -8,7 +8,7 @@ common.gypi is a file that's included in the node header bundle, despite
the fact that we do not build node with gyp. the fact that we do not build node with gyp.
diff --git a/common.gypi b/common.gypi diff --git a/common.gypi b/common.gypi
index 3b9cc3e885b254c80b2ff2ba1585972ce51a1e70..344466dd249323768541ae8c6c2800795845eea8 100644 index cebf2121ff913080ab0771f6c4dfa35ce6812bc0..df69aecc74ef66b9501d4bed0e1311e7cda2d5b8 100644
--- a/common.gypi --- a/common.gypi
+++ b/common.gypi +++ b/common.gypi
@@ -73,6 +73,22 @@ @@ -73,6 +73,22 @@

View file

@ -7,7 +7,7 @@ async hooks are hella broken in Electron. This was checking that they weren't,
but they are, so we just disabled the check. YOLO. but they are, so we just disabled the check. YOLO.
diff --git a/src/api/callback.cc b/src/api/callback.cc diff --git a/src/api/callback.cc b/src/api/callback.cc
index c8934e1cd33a364ba55b437b080fe2c1c0f5de6c..63c9f5d7c08bebd25bd2602ab6b97c8987a102a4 100644 index a03a2587b4c7963a7f356b6b3af8654405bcfd36..cd0050978d387c2d2228653a8e812a31a1145819 100644
--- a/src/api/callback.cc --- a/src/api/callback.cc
+++ b/src/api/callback.cc +++ b/src/api/callback.cc
@@ -117,12 +117,14 @@ void InternalCallbackScope::Close() { @@ -117,12 +117,14 @@ void InternalCallbackScope::Close() {