chore: bump node to v14.15.2 (master) (#27045)
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
parent
75247d18d0
commit
8f9058ea72
8 changed files with 29 additions and 24 deletions
2
DEPS
2
DEPS
|
@ -16,7 +16,7 @@ vars = {
|
||||||
'chromium_version':
|
'chromium_version':
|
||||||
'89292a4ae29096e5313aaf19dfa0c4710145c34d',
|
'89292a4ae29096e5313aaf19dfa0c4710145c34d',
|
||||||
'node_version':
|
'node_version':
|
||||||
'v14.15.1',
|
'v14.15.2',
|
||||||
'nan_version':
|
'nan_version':
|
||||||
'2c4ee8a32a299eada3cd6e468bbd0a473bfea96d',
|
'2c4ee8a32a299eada3cd6e468bbd0a473bfea96d',
|
||||||
'squirrel.mac_version':
|
'squirrel.mac_version':
|
||||||
|
|
|
@ -846,10 +846,10 @@ index 0000000000000000000000000000000000000000..2c9d2826c85bdd033f1df1d6188df636
|
||||||
+}
|
+}
|
||||||
diff --git a/filenames.json b/filenames.json
|
diff --git a/filenames.json b/filenames.json
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 0000000000000000000000000000000000000000..eec6077168980a5248f638c6c4fc33693676437d
|
index 0000000000000000000000000000000000000000..2dfbb6aae48b65312f212ab01474763d5a796a23
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/filenames.json
|
+++ b/filenames.json
|
||||||
@@ -0,0 +1,533 @@
|
@@ -0,0 +1,538 @@
|
||||||
+// This file is automatically generated by generate_gn_filenames_json.py
|
+// This file is automatically generated by generate_gn_filenames_json.py
|
||||||
+// DO NOT EDIT
|
+// DO NOT EDIT
|
||||||
+{
|
+{
|
||||||
|
@ -1163,6 +1163,11 @@ index 0000000000000000000000000000000000000000..eec6077168980a5248f638c6c4fc3369
|
||||||
+ "lib/internal/streams/duplexpair.js",
|
+ "lib/internal/streams/duplexpair.js",
|
||||||
+ "lib/internal/streams/from.js",
|
+ "lib/internal/streams/from.js",
|
||||||
+ "lib/internal/streams/legacy.js",
|
+ "lib/internal/streams/legacy.js",
|
||||||
|
+ "lib/internal/streams/readable.js",
|
||||||
|
+ "lib/internal/streams/writable.js",
|
||||||
|
+ "lib/internal/streams/duplex.js",
|
||||||
|
+ "lib/internal/streams/passthrough.js",
|
||||||
|
+ "lib/internal/streams/transform.js",
|
||||||
+ "lib/internal/streams/destroy.js",
|
+ "lib/internal/streams/destroy.js",
|
||||||
+ "lib/internal/streams/state.js",
|
+ "lib/internal/streams/state.js",
|
||||||
+ "lib/internal/streams/pipeline.js",
|
+ "lib/internal/streams/pipeline.js",
|
||||||
|
@ -1184,7 +1189,6 @@ index 0000000000000000000000000000000000000000..eec6077168980a5248f638c6c4fc3369
|
||||||
+ "deps/acorn/acorn/dist/acorn.js",
|
+ "deps/acorn/acorn/dist/acorn.js",
|
||||||
+ "deps/acorn/acorn-walk/dist/walk.js",
|
+ "deps/acorn/acorn-walk/dist/walk.js",
|
||||||
+ "deps/acorn-plugins/acorn-class-fields/index.js",
|
+ "deps/acorn-plugins/acorn-class-fields/index.js",
|
||||||
+ "deps/acorn-plugins/acorn-numeric-separator/index.js",
|
|
||||||
+ "deps/acorn-plugins/acorn-private-class-elements/index.js",
|
+ "deps/acorn-plugins/acorn-private-class-elements/index.js",
|
||||||
+ "deps/acorn-plugins/acorn-private-methods/index.js",
|
+ "deps/acorn-plugins/acorn-private-methods/index.js",
|
||||||
+ "deps/acorn-plugins/acorn-static-class-features/index.js",
|
+ "deps/acorn-plugins/acorn-static-class-features/index.js",
|
||||||
|
@ -1293,6 +1297,7 @@ index 0000000000000000000000000000000000000000..eec6077168980a5248f638c6c4fc3369
|
||||||
+ "src/base_object.h",
|
+ "src/base_object.h",
|
||||||
+ "src/base_object-inl.h",
|
+ "src/base_object-inl.h",
|
||||||
+ "src/base64.h",
|
+ "src/base64.h",
|
||||||
|
+ "src/base64-inl.h",
|
||||||
+ "src/callback_queue.h",
|
+ "src/callback_queue.h",
|
||||||
+ "src/callback_queue-inl.h",
|
+ "src/callback_queue-inl.h",
|
||||||
+ "src/connect_wrap.h",
|
+ "src/connect_wrap.h",
|
||||||
|
@ -1589,7 +1594,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 20855d5807e0326118a10ccffe694af2e67d8b79..33422dd4eca758c08de679ac4cb5eba83b7ce145 100644
|
index e285f3d79b8833f95f0b24d0a2c2d62c13037a44..8be21f12f6913d5d06d8a5dcb508c62ba3a72144 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 @@
|
||||||
|
@ -1728,10 +1733,10 @@ index 0000000000000000000000000000000000000000..3088ae4bdf814ae255c9805ebd393b2e
|
||||||
+
|
+
|
||||||
+ out_file.writelines(new_contents)
|
+ out_file.writelines(new_contents)
|
||||||
diff --git a/tools/install.py b/tools/install.py
|
diff --git a/tools/install.py b/tools/install.py
|
||||||
index 655802980a6ea94d1d4ca1dc63c8c8e905fbb83a..ab1a18a215cb7393310324c6dbcacc6655bae9ef 100755
|
index 729b416fc47d3ff3317ae3671dee977c719a8841..530ca7d441d3b65d4e4fac7dd5880afe56aa3807 100755
|
||||||
--- a/tools/install.py
|
--- a/tools/install.py
|
||||||
+++ b/tools/install.py
|
+++ b/tools/install.py
|
||||||
@@ -163,8 +163,8 @@ def files(action):
|
@@ -159,8 +159,8 @@ def files(action):
|
||||||
def headers(action):
|
def headers(action):
|
||||||
def ignore_inspector_headers(files_arg, dest):
|
def ignore_inspector_headers(files_arg, dest):
|
||||||
inspector_headers = [
|
inspector_headers = [
|
||||||
|
@ -1742,7 +1747,7 @@ index 655802980a6ea94d1d4ca1dc63c8c8e905fbb83a..ab1a18a215cb7393310324c6dbcacc66
|
||||||
]
|
]
|
||||||
files_arg = [name for name in files_arg if name not in inspector_headers]
|
files_arg = [name for name in files_arg if name not in inspector_headers]
|
||||||
action(files_arg, dest)
|
action(files_arg, dest)
|
||||||
@@ -186,7 +186,7 @@ def headers(action):
|
@@ -182,7 +182,7 @@ def headers(action):
|
||||||
if sys.platform.startswith('aix'):
|
if sys.platform.startswith('aix'):
|
||||||
action(['out/Release/node.exp'], 'include/node/')
|
action(['out/Release/node.exp'], 'include/node/')
|
||||||
|
|
||||||
|
@ -1752,7 +1757,7 @@ index 655802980a6ea94d1d4ca1dc63c8c8e905fbb83a..ab1a18a215cb7393310324c6dbcacc66
|
||||||
if 'false' == variables.get('node_shared_libuv'):
|
if 'false' == variables.get('node_shared_libuv'):
|
||||||
subdir_files('deps/uv/include', 'include/node/', action)
|
subdir_files('deps/uv/include', 'include/node/', action)
|
||||||
diff --git a/tools/js2c.py b/tools/js2c.py
|
diff --git a/tools/js2c.py b/tools/js2c.py
|
||||||
index 195e6a6189a98916bcfb7abb1b73595b8bc8eb38..d5109fcae5542730623f5ec3ca244ec0973109f2 100755
|
index 0f073e182bdb2858957e4b28ae15b366d7933dbe..93e9474297fd9032981786ae9d4e005f2d1a9a2e 100755
|
||||||
--- a/tools/js2c.py
|
--- a/tools/js2c.py
|
||||||
+++ b/tools/js2c.py
|
+++ b/tools/js2c.py
|
||||||
@@ -130,6 +130,14 @@ def NormalizeFileName(filename):
|
@@ -130,6 +130,14 @@ def NormalizeFileName(filename):
|
||||||
|
|
|
@ -38,7 +38,7 @@ index 3be3f2364dd252bcdd668c699a0e7ae1e754e873..b2af1bce312ffca44e7005e11f92327e
|
||||||
|
|
||||||
bool Exists(const char* id);
|
bool Exists(const char* id);
|
||||||
diff --git a/tools/js2c.py b/tools/js2c.py
|
diff --git a/tools/js2c.py b/tools/js2c.py
|
||||||
index d5109fcae5542730623f5ec3ca244ec0973109f2..b25a9038ea7cfdb49b81e85f5bf497cc360e2b9e 100755
|
index 93e9474297fd9032981786ae9d4e005f2d1a9a2e..bca4c44a31d1ffe7c9ae15b6f60cd55e325f707d 100755
|
||||||
--- a/tools/js2c.py
|
--- a/tools/js2c.py
|
||||||
+++ b/tools/js2c.py
|
+++ b/tools/js2c.py
|
||||||
@@ -38,6 +38,8 @@ import functools
|
@@ -38,6 +38,8 @@ import functools
|
||||||
|
@ -129,7 +129,7 @@ index d5109fcae5542730623f5ec3ca244ec0973109f2..b25a9038ea7cfdb49b81e85f5bf497cc
|
||||||
write_if_chaged(out, target)
|
write_if_chaged(out, target)
|
||||||
|
|
||||||
|
|
||||||
@@ -209,17 +228,21 @@ def main():
|
@@ -211,17 +230,21 @@ def main():
|
||||||
)
|
)
|
||||||
parser.add_argument('--target', help='output file')
|
parser.add_argument('--target', help='output file')
|
||||||
parser.add_argument('--verbose', action='store_true', help='output file')
|
parser.add_argument('--verbose', action='store_true', help='output file')
|
||||||
|
|
|
@ -8,12 +8,12 @@ once we stop warning and begin to unilaterally prevent non-context aware modules
|
||||||
from being loaded.
|
from being loaded.
|
||||||
|
|
||||||
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
|
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
|
||||||
index 1b781fb8193002e111d8904e44ca66dbec9daaac..3f80a6e4c03a51d40c25717baab5c690c53abccd 100644
|
index af69dfc9e71b54a9d7eda0daa498396008aba610..f52e8a09f689bafcfdca39e71822ff3cbf898349 100644
|
||||||
--- a/lib/internal/bootstrap/pre_execution.js
|
--- a/lib/internal/bootstrap/pre_execution.js
|
||||||
+++ b/lib/internal/bootstrap/pre_execution.js
|
+++ b/lib/internal/bootstrap/pre_execution.js
|
||||||
@@ -93,10 +93,12 @@ function patchProcessObject(expandArgv1) {
|
@@ -95,10 +95,12 @@ function patchProcessObject(expandArgv1) {
|
||||||
|
if (expandArgv1 && process.argv[1] &&
|
||||||
if (expandArgv1 && process.argv[1] && !process.argv[1].startsWith('-')) {
|
!StringPrototypeStartsWith(process.argv[1], '-')) {
|
||||||
// Expand process.argv[1] into a full path.
|
// Expand process.argv[1] into a full path.
|
||||||
- const path = require('path');
|
- const path = require('path');
|
||||||
- try {
|
- try {
|
||||||
|
@ -113,7 +113,7 @@ index ca5a01f925a2ae69ba4295d82316e546f45c60cd..928afa04f4312db23ef4de8c32e07057
|
||||||
}
|
}
|
||||||
mp->nm_dso_handle = dlib->handle_;
|
mp->nm_dso_handle = dlib->handle_;
|
||||||
diff --git a/src/node_options.cc b/src/node_options.cc
|
diff --git a/src/node_options.cc b/src/node_options.cc
|
||||||
index 87f547da1de1c4b0d5913f0af461ee229b18aa02..c12ec1d13864b1aca227aa06b75339c14ebc5b4e 100644
|
index e7dc220f5c3fcab40c9a669a79b3a41b7e9f8cbf..01143e122387db8220d6e0cd0124ae08e082d0c8 100644
|
||||||
--- a/src/node_options.cc
|
--- a/src/node_options.cc
|
||||||
+++ b/src/node_options.cc
|
+++ b/src/node_options.cc
|
||||||
@@ -371,6 +371,10 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
|
@@ -371,6 +371,10 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
|
||||||
|
|
|
@ -7,10 +7,10 @@ This is used so that we can modify the flag at runtime where
|
||||||
config can only be set at compile time.
|
config can only be set at compile time.
|
||||||
|
|
||||||
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
|
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
|
||||||
index e1f70addc28e4fe31d3a7089ecec3b5874dde75a..659145e31bbfb6ce782e8dcad452b59202df7573 100644
|
index 5aab40071b68affe602be16d451be598b246faa1..6a55064eac76ee88d3b0b734d4f242da80aca119 100644
|
||||||
--- a/lib/internal/bootstrap/node.js
|
--- a/lib/internal/bootstrap/node.js
|
||||||
+++ b/lib/internal/bootstrap/node.js
|
+++ b/lib/internal/bootstrap/node.js
|
||||||
@@ -118,7 +118,7 @@ const {
|
@@ -119,7 +119,7 @@ const {
|
||||||
queueMicrotask
|
queueMicrotask
|
||||||
} = require('internal/process/task_queues');
|
} = require('internal/process/task_queues');
|
||||||
|
|
||||||
|
|
|
@ -6,10 +6,10 @@ Subject: feat: initialize asar support
|
||||||
This patch initializes asar support in Node.js.
|
This patch initializes asar support in Node.js.
|
||||||
|
|
||||||
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
|
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
|
||||||
index 9689e2a9edf69530546d5238155f6ea28dd70daf..1b781fb8193002e111d8904e44ca66dbec9daaac 100644
|
index c76add4621b614dd7dd4f4d369fb6ce7598ee22d..af69dfc9e71b54a9d7eda0daa498396008aba610 100644
|
||||||
--- a/lib/internal/bootstrap/pre_execution.js
|
--- a/lib/internal/bootstrap/pre_execution.js
|
||||||
+++ b/lib/internal/bootstrap/pre_execution.js
|
+++ b/lib/internal/bootstrap/pre_execution.js
|
||||||
@@ -74,6 +74,7 @@ function prepareMainThreadExecution(expandArgv1 = false) {
|
@@ -75,6 +75,7 @@ function prepareMainThreadExecution(expandArgv1 = false) {
|
||||||
assert(!CJSLoader.hasLoadedAnyUserCJSModule);
|
assert(!CJSLoader.hasLoadedAnyUserCJSModule);
|
||||||
loadPreloadModules();
|
loadPreloadModules();
|
||||||
initializeFrozenIntrinsics();
|
initializeFrozenIntrinsics();
|
||||||
|
@ -17,7 +17,7 @@ index 9689e2a9edf69530546d5238155f6ea28dd70daf..1b781fb8193002e111d8904e44ca66db
|
||||||
}
|
}
|
||||||
|
|
||||||
function patchProcessObject(expandArgv1) {
|
function patchProcessObject(expandArgv1) {
|
||||||
@@ -448,6 +449,10 @@ function loadPreloadModules() {
|
@@ -450,6 +451,10 @@ function loadPreloadModules() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,10 +7,10 @@ We use this to allow node's 'fs' module to read from ASAR files as if they were
|
||||||
a real filesystem.
|
a real filesystem.
|
||||||
|
|
||||||
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
|
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
|
||||||
index 6d6ca2af629c41df68fe1a4652cf94fef30be038..e1f70addc28e4fe31d3a7089ecec3b5874dde75a 100644
|
index 2705f8b50a658db0fc1ce6fba245792f6a567300..5aab40071b68affe602be16d451be598b246faa1 100644
|
||||||
--- a/lib/internal/bootstrap/node.js
|
--- a/lib/internal/bootstrap/node.js
|
||||||
+++ b/lib/internal/bootstrap/node.js
|
+++ b/lib/internal/bootstrap/node.js
|
||||||
@@ -56,6 +56,10 @@ setupBuffer();
|
@@ -57,6 +57,10 @@ setupBuffer();
|
||||||
process.domain = null;
|
process.domain = null;
|
||||||
process._exiting = false;
|
process._exiting = false;
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ through MakeExternal - to fix this we make the strings bigger so as to
|
||||||
make then internal & external & not uncached (i.e. cached).
|
make then internal & external & not uncached (i.e. cached).
|
||||||
|
|
||||||
diff --git a/test/parallel/test-fs-write.js b/test/parallel/test-fs-write.js
|
diff --git a/test/parallel/test-fs-write.js b/test/parallel/test-fs-write.js
|
||||||
index a6724eac300d16a36ca0e64788516adb9d6f6536..e152383b56c6f2791852d5f9fb151693c2d962a6 100644
|
index bdee397eb58dd2e5ca59dc1ec280e9e664ba23f9..c52c958a1fd1a5679f731a1360b0563d13fa7581 100644
|
||||||
--- a/test/parallel/test-fs-write.js
|
--- a/test/parallel/test-fs-write.js
|
||||||
+++ b/test/parallel/test-fs-write.js
|
+++ b/test/parallel/test-fs-write.js
|
||||||
@@ -40,7 +40,7 @@ const constants = fs.constants;
|
@@ -40,7 +40,7 @@ const constants = fs.constants;
|
||||||
|
|
Loading…
Reference in a new issue