chore: bump node to v18.13.0 (main) (#36818)
* chore: bump node in DEPS to v18.13.0 * child_process: validate arguments for null bytes https://github.com/nodejs/node/pull/44782 * bootstrap: merge main thread and worker thread initializations https://github.com/nodejs/node/pull/44869 * module: ensure relative requires work from deleted directories https://github.com/nodejs/node/pull/42384 * src: add support for externally shared js builtins https://github.com/nodejs/node/issues/44000 * lib: disambiguate `native module` to `binding` https://github.com/nodejs/node/pull/45673 * test: convert test-debugger-pid to async/await https://github.com/nodejs/node/pull/45179 * deps: upgrade to libuv 1.44.2 https://github.com/nodejs/node/pull/42340 * src: fix cppgc incompatibility in v8 https://github.com/nodejs/node/pull/43521 * src: use qualified `std::move` call in node_http2 https://github.com/nodejs/node/pull/45555 * build: fix env.h for cpp20 https://github.com/nodejs/node/pull/45516 * test: remove experimental-wasm-threads flag https://github.com/nodejs/node/pull/45074 * src: iwyu in cleanup_queue.cc https://github.com/nodejs/node/pull/44983 * src: add missing include for `std::all_of` https://github.com/nodejs/node/pull/45541 * deps: update ICU to 72.1 https://github.com/nodejs/node/pull/45068 * chore: fixup patch indices * chore: remove errant semicolons - https://github.com/nodejs/node/pull/44179 - https://github.com/nodejs/node/pull/44193 * src: add support for externally shared js builtins https://github.com/nodejs/node/pull/44376 * chore: add missing GN filenames * deps: update nghttp2 to 1.51.0 https://github.com/nodejs/node/pull/45537 * chore: disable more Node.js snapshot tests The Snapshot feature is currently disabled * chore: disable ICU timezone tests Node.js uses a different version of ICU than Electron so they will often be out of sync. * chore: disable threadpool event tracing test Event tracing is not enabled in embedded Node.js * chore: fixup patch indices * chore: comments from review Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
electron-roller[bot]
GitHub
parent
b3d16e727c
commit
1d9a4ab02c
54 changed files with 330 additions and 2311 deletions
|
|
@ -893,10 +893,10 @@ index 0000000000000000000000000000000000000000..fb000f8ee7647c375bc190d1729d67bb
|
|||
+}
|
||||
diff --git a/deps/nghttp2/BUILD.gn b/deps/nghttp2/BUILD.gn
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..9abde472d88923db835b12982b7f2ccb1f260196
|
||||
index 0000000000000000000000000000000000000000..23eed033d31eced6a85c794eee550655af7a9a1d
|
||||
--- /dev/null
|
||||
+++ b/deps/nghttp2/BUILD.gn
|
||||
@@ -0,0 +1,47 @@
|
||||
@@ -0,0 +1,48 @@
|
||||
+config("nghttp2_config") {
|
||||
+ defines = [ "NGHTTP2_STATICLIB" ]
|
||||
+ include_dirs = [ "lib/includes" ]
|
||||
|
|
@ -923,6 +923,7 @@ index 0000000000000000000000000000000000000000..9abde472d88923db835b12982b7f2ccb
|
|||
+ "lib/nghttp2_buf.c",
|
||||
+ "lib/nghttp2_callbacks.c",
|
||||
+ "lib/nghttp2_debug.c",
|
||||
+ "lib/nghttp2_extpri.c",
|
||||
+ "lib/nghttp2_frame.c",
|
||||
+ "lib/nghttp2_hd.c",
|
||||
+ "lib/nghttp2_hd_huffman.c",
|
||||
|
|
@ -1192,10 +1193,10 @@ index 0000000000000000000000000000000000000000..2c9d2826c85bdd033f1df1d6188df636
|
|||
+}
|
||||
diff --git a/filenames.json b/filenames.json
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..b445ccdd7ba2f0b5661d4761f995a4c9b477239e
|
||||
index 0000000000000000000000000000000000000000..a991bef2b98766a1cfb248d2af97101af305de82
|
||||
--- /dev/null
|
||||
+++ b/filenames.json
|
||||
@@ -0,0 +1,638 @@
|
||||
@@ -0,0 +1,653 @@
|
||||
+// This file is automatically generated by generate_gn_filenames_json.py
|
||||
+// DO NOT EDIT
|
||||
+{
|
||||
|
|
@ -1301,7 +1302,6 @@ index 0000000000000000000000000000000000000000..b445ccdd7ba2f0b5661d4761f995a4c9
|
|||
+ "dest_dir": "include/node//uv/",
|
||||
+ "files": [
|
||||
+ "deps/uv/include/uv/aix.h",
|
||||
+ "deps/uv/include/uv/android-ifaddrs.h",
|
||||
+ "deps/uv/include/uv/bsd.h",
|
||||
+ "deps/uv/include/uv/darwin.h",
|
||||
+ "deps/uv/include/uv/errno.h",
|
||||
|
|
@ -1414,6 +1414,7 @@ index 0000000000000000000000000000000000000000..b445ccdd7ba2f0b5661d4761f995a4c9
|
|||
+ "lib/internal/error_serdes.js",
|
||||
+ "lib/internal/errors.js",
|
||||
+ "lib/internal/event_target.js",
|
||||
+ "lib/internal/file.js",
|
||||
+ "lib/internal/fixed_queue.js",
|
||||
+ "lib/internal/freelist.js",
|
||||
+ "lib/internal/freeze_intrinsics.js",
|
||||
|
|
@ -1422,6 +1423,7 @@ index 0000000000000000000000000000000000000000..b445ccdd7ba2f0b5661d4761f995a4c9
|
|||
+ "lib/internal/fs/dir.js",
|
||||
+ "lib/internal/fs/promises.js",
|
||||
+ "lib/internal/fs/read_file_context.js",
|
||||
+ "lib/internal/fs/recursive_watch.js",
|
||||
+ "lib/internal/fs/rimraf.js",
|
||||
+ "lib/internal/fs/streams.js",
|
||||
+ "lib/internal/fs/sync_write_stream.js",
|
||||
|
|
@ -1451,6 +1453,7 @@ index 0000000000000000000000000000000000000000..b445ccdd7ba2f0b5661d4761f995a4c9
|
|||
+ "lib/internal/main/test_runner.js",
|
||||
+ "lib/internal/main/watch_mode.js",
|
||||
+ "lib/internal/main/worker_thread.js",
|
||||
+ "lib/internal/mime.js",
|
||||
+ "lib/internal/modules/cjs/helpers.js",
|
||||
+ "lib/internal/modules/cjs/loader.js",
|
||||
+ "lib/internal/modules/esm/assert.js",
|
||||
|
|
@ -1537,7 +1540,11 @@ index 0000000000000000000000000000000000000000..b445ccdd7ba2f0b5661d4761f995a4c9
|
|||
+ "lib/internal/test/binding.js",
|
||||
+ "lib/internal/test/transfer.js",
|
||||
+ "lib/internal/test_runner/harness.js",
|
||||
+ "lib/internal/test_runner/mock.js",
|
||||
+ "lib/internal/test_runner/runner.js",
|
||||
+ "lib/internal/test_runner/tap_checker.js",
|
||||
+ "lib/internal/test_runner/tap_lexer.js",
|
||||
+ "lib/internal/test_runner/tap_parser.js",
|
||||
+ "lib/internal/test_runner/tap_stream.js",
|
||||
+ "lib/internal/test_runner/test.js",
|
||||
+ "lib/internal/test_runner/utils.js",
|
||||
|
|
@ -1561,6 +1568,7 @@ index 0000000000000000000000000000000000000000..b445ccdd7ba2f0b5661d4761f995a4c9
|
|||
+ "lib/internal/v8_prof_polyfill.js",
|
||||
+ "lib/internal/v8_prof_processor.js",
|
||||
+ "lib/internal/validators.js",
|
||||
+ "lib/internal/vm.js",
|
||||
+ "lib/internal/vm/module.js",
|
||||
+ "lib/internal/wasm_web_api.js",
|
||||
+ "lib/internal/watch_mode/files_watcher.js",
|
||||
|
|
@ -1637,6 +1645,7 @@ index 0000000000000000000000000000000000000000..b445ccdd7ba2f0b5661d4761f995a4c9
|
|||
+ "src/api/hooks.cc",
|
||||
+ "src/api/utils.cc",
|
||||
+ "src/async_wrap.cc",
|
||||
+ "src/base_object.cc",
|
||||
+ "src/cares_wrap.cc",
|
||||
+ "src/cleanup_queue.cc",
|
||||
+ "src/connect_wrap.cc",
|
||||
|
|
@ -1685,10 +1694,12 @@ index 0000000000000000000000000000000000000000..b445ccdd7ba2f0b5661d4761f995a4c9
|
|||
+ "src/node_process_events.cc",
|
||||
+ "src/node_process_methods.cc",
|
||||
+ "src/node_process_object.cc",
|
||||
+ "src/node_realm.cc",
|
||||
+ "src/node_report.cc",
|
||||
+ "src/node_report_module.cc",
|
||||
+ "src/node_report_utils.cc",
|
||||
+ "src/node_serdes.cc",
|
||||
+ "src/node_shadow_realm.cc",
|
||||
+ "src/node_snapshotable.cc",
|
||||
+ "src/node_sockaddr.cc",
|
||||
+ "src/node_stat_watcher.cc",
|
||||
|
|
@ -1743,6 +1754,7 @@ index 0000000000000000000000000000000000000000..b445ccdd7ba2f0b5661d4761f995a4c9
|
|||
+ "src/connection_wrap.h",
|
||||
+ "src/debug_utils.h",
|
||||
+ "src/debug_utils-inl.h",
|
||||
+ "src/env_properties.h",
|
||||
+ "src/env.h",
|
||||
+ "src/env-inl.h",
|
||||
+ "src/handle_wrap.h",
|
||||
|
|
@ -1790,9 +1802,12 @@ index 0000000000000000000000000000000000000000..b445ccdd7ba2f0b5661d4761f995a4c9
|
|||
+ "src/node_platform.h",
|
||||
+ "src/node_process.h",
|
||||
+ "src/node_process-inl.h",
|
||||
+ "src/node_realm.h",
|
||||
+ "src/node_realm-inl.h",
|
||||
+ "src/node_report.h",
|
||||
+ "src/node_revert.h",
|
||||
+ "src/node_root_certs.h",
|
||||
+ "src/node_shadow_realm.h",
|
||||
+ "src/node_snapshotable.h",
|
||||
+ "src/node_snapshot_builder.h",
|
||||
+ "src/node_sockaddr.h",
|
||||
|
|
@ -1800,6 +1815,7 @@ index 0000000000000000000000000000000000000000..b445ccdd7ba2f0b5661d4761f995a4c9
|
|||
+ "src/node_stat_watcher.h",
|
||||
+ "src/node_union_bytes.h",
|
||||
+ "src/node_url.h",
|
||||
+ "src/node_util.h",
|
||||
+ "src/node_version.h",
|
||||
+ "src/node_v8.h",
|
||||
+ "src/node_v8_platform-inl.h",
|
||||
|
|
@ -2075,7 +2091,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 68c7df653ebb84d9e0c5d34a1cfa4fa3bd4ce690..2762b9f8ae782518ecc9c21f09880c10025155aa 100644
|
||||
index d6b2f18cf8599ed7994954c808379565b740ac83..cd73f646bb3e9dbc4d9f4a3f24ef5970ec33b3a5 100644
|
||||
--- a/src/node_version.h
|
||||
+++ b/src/node_version.h
|
||||
@@ -89,7 +89,10 @@
|
||||
|
|
@ -2091,10 +2107,10 @@ index 68c7df653ebb84d9e0c5d34a1cfa4fa3bd4ce690..2762b9f8ae782518ecc9c21f09880c10
|
|||
// which the Node binary being built supports.
|
||||
diff --git a/tools/generate_gn_filenames_json.py b/tools/generate_gn_filenames_json.py
|
||||
new file mode 100755
|
||||
index 0000000000000000000000000000000000000000..87621ba1d7f1c80aadb81461824b0c2edab1de22
|
||||
index 0000000000000000000000000000000000000000..616dc0c61ed4ea1bf2fb9e4768ba2ec566a83e42
|
||||
--- /dev/null
|
||||
+++ b/tools/generate_gn_filenames_json.py
|
||||
@@ -0,0 +1,75 @@
|
||||
@@ -0,0 +1,81 @@
|
||||
+#!/usr/bin/env python3
|
||||
+import json
|
||||
+import os
|
||||
|
|
@ -2143,6 +2159,12 @@ index 0000000000000000000000000000000000000000..87621ba1d7f1c80aadb81461824b0c2e
|
|||
+ def filter_v8_files(files):
|
||||
+ if any(f.startswith('deps/v8/') for f in files):
|
||||
+ files = [f.replace('deps/v8/', '//v8/', 1) for f in files]
|
||||
+
|
||||
+ if any(f == '<@(node_builtin_shareable_builtins)' for f in files):
|
||||
+ files.remove('<@(node_builtin_shareable_builtins)')
|
||||
+ shared_builtins = ['deps/cjs-module-lexer/lexer.js', 'deps/cjs-module-lexer/dist/lexer.js', 'deps/undici/undici.js']
|
||||
+ files.extend(shared_builtins)
|
||||
+
|
||||
+ return files
|
||||
+
|
||||
+ lib_files = SearchFiles('lib', 'js')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue