mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: upgrade to Node.js v18 (#35999)

Browse source 
* chore: update to Node.js v18

* child_process: improve argument validation

https://github.com/nodejs/node/pull/41305

* bootstrap: support configure-time user-land snapshot

https://github.com/nodejs/node/pull/42466

* chore: update GN patch

* src: disambiguate terms used to refer to builtins and addons

https://github.com/nodejs/node/pull/44135

* src: use a typed array internally for process._exiting

https://github.com/nodejs/node/pull/43883

* chore: lib/internal/bootstrap -> lib/internal/process

* src: disambiguate terms used to refer to builtins and addons

https://github.com/nodejs/node/pull/44135

* chore: remove redudant browserGlobals patch

* chore: update BoringSSL patch

* src: allow embedder-provided PageAllocator in NodePlatform

https://github.com/nodejs/node/pull/38362

* chore: fixup Node.js crypto tests

- https://github.com/nodejs/node/pull/44171
- https://github.com/nodejs/node/pull/41600

* lib: add Promise methods to avoid-prototype-pollution lint rule

https://github.com/nodejs/node/pull/43849

* deps: update V8 to 10.1

https://github.com/nodejs/node/pull/42657

* src: add kNoBrowserGlobals flag for Environment

https://github.com/nodejs/node/pull/40532

* chore: consolidate asar initialization patches

* deps: update V8 to 10.1

https://github.com/nodejs/node/pull/42657

* deps: update V8 to 9.8

https://github.com/nodejs/node/pull/41610

* src,crypto: remove AllocatedBuffers from crypto_spkac

https://github.com/nodejs/node/pull/40752

* build: enable V8's shared read-only heap

https://github.com/nodejs/node/pull/42809

* src: fix ssize_t error from nghttp2.h

https://github.com/nodejs/node/pull/44393

* chore: fixup ESM patch

* chore: fixup patch indices

* src: merge NativeModuleEnv into NativeModuleLoader

https://github.com/nodejs/node/pull/43824

* [API] Pass OOMDetails to OOMErrorCallback

3647827

* src: iwyu in cleanup_queue.cc

* src: return Maybe from a couple of functions

https://github.com/nodejs/node/pull/39603

* src: clean up embedder API

https://github.com/nodejs/node/pull/35897

* src: refactor DH groups to delete crypto_groups.h

https://github.com/nodejs/node/pull/43896

* deps,src: use SIMD for normal base64 encoding

https://github.com/nodejs/node/pull/39775

* chore: remove deleted source file

* chore: update patches

* chore: remove deleted source file

* lib: add fetch

https://github.com/nodejs/node/pull/41749

* chore: remove nonexistent node specs

* test: split report OOM tests

https://github.com/nodejs/node/pull/44389

* src: trace fs async api

https://github.com/nodejs/node/pull/44057

* http: trace http request / response

https://github.com/nodejs/node/pull/44102

* test: split test-crypto-dh.js

https://github.com/nodejs/node/pull/40451

* crypto: introduce X509Certificate API

https://github.com/nodejs/node/pull/36804

* src: split property helpers from node::Environment

https://github.com/nodejs/node/pull/44056

* https://github.com/nodejs/node/pull/38905

bootstrap: implement run-time user-land snapshots via --build-snapshot and --snapshot-blob

* lib,src: implement WebAssembly Web API

https://github.com/nodejs/node/pull/42701

* fixup! deps,src: use SIMD for normal base64 encoding

* fixup! src: refactor DH groups to delete crypto_groups.h

* chore: fixup base64 GN file

* fix: check that node::InitializeContext() returns true

* chore: delete _noBrowserGlobals usage

* chore: disable fetch in renderer procceses

* dns: default to verbatim=true in dns.lookup()

https://github.com/nodejs/node/pull/39987

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
This commit is contained in:
Shelley Vohr 2022-11-10 22:31:20 +01:00 • committed by GitHub
parent 1b1609aa0f
commit 75d2caf451
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
50 changed files with 792 additions and 1134 deletions
Download patch file Download diff file Expand all files Collapse all files

273
patches/node/build_add_gn_build_files.patch
View file

@ -7,7 +7,7 @@ This adds GN build files for Node, so we don't have to build with GYP.
diff --git a/BUILD.gn b/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..a47875642d8f825c84ba1e82e3892a97e98e76e4
index 0000000000000000000000000000000000000000..db80a8f00a84bf54f723c21300e7579c994d0514
--- /dev/null
+++ b/BUILD.gn
@@ -0,0 +1,438 @@
@ -224,6 +224,7 @@ index 0000000000000000000000000000000000000000..a47875642d8f825c84ba1e82e3892a97
+ ":node_js2c",
+ "deps/googletest:gtest",
+ "deps/uvwasi",
+ "deps/base64",
+ "//third_party/zlib",
+ "//third_party/brotli:dec",
+ "//third_party/brotli:enc",
@ -281,7 +282,6 @@ index 0000000000000000000000000000000000000000..a47875642d8f825c84ba1e82e3892a97
+ sources += [
+ "$root_gen_dir/electron_natives.cc",
+ "$target_gen_dir/node_javascript.cc",
+ "src/node_code_cache_stub.cc",
+ "src/node_snapshot_stub.cc",
+ ]
+
@ -449,6 +449,192 @@ index 0000000000000000000000000000000000000000..a47875642d8f825c84ba1e82e3892a97
+ ":tar_headers",
+ ]
+}
diff --git a/deps/base64/BUILD.gn b/deps/base64/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..694e1991bb11c9ea85fcc69a0e06265d4b0c5aab
--- /dev/null
+++ b/deps/base64/BUILD.gn
@@ -0,0 +1,152 @@
+config("base64_config") {
+ include_dirs = [
+ "base64/include",
+ "base64/lib",
+ ]
+
+ defines = [ "BASE64_STATIC_DEFINE" ]
+}
+
+static_library("base64") {
+ defines = []
+ deps = []
+
+ public_configs = [ ":base64_config" ]
+
+ cflags_c = [
+ "-Wno-implicit-fallthrough",
+ "-Wno-unused-but-set-variable",
+ "-Wno-shadow",
+ ]
+
+ sources = [
+ "base64/include/libbase64.h",
+ "base64/lib/arch/generic/codec.c",
+ "base64/lib/codec_choose.c",
+ "base64/lib/codecs.h",
+ "base64/lib/lib.c",
+ "base64/lib/tables/tables.c",
+ ]
+
+ if (target_cpu == "arm") {
+ defines += [ "HAVE_NEON32=1" ]
+ deps += [ ":base64_neon32" ]
+ } else {
+ sources += [ "base64/lib/arch/neon32/neon32_codec.c" ]
+ }
+
+ if (target_cpu == "arm64") {
+ defines += [ "HAVE_NEON64=1" ]
+ deps += [ ":base64_neon64" ]
+ } else {
+ sources += [ "base64/lib/arch/neon64/neon64_codec.c" ]
+ }
+
+ if (target_cpu == "ia32" || target_cpu == "x64" || target_cpu == "x32") {
+ defines += [
+ "HAVE_SSSE3=1",
+ "HAVE_SSE41=1",
+ "HAVE_SSE42=1",
+ "HAVE_AVX=1",
+ "HAVE_AVX2=1",
+ ]
+
+ deps += [
+ ":base64_avx",
+ ":base64_avx2",
+ ":base64_sse41",
+ ":base64_sse42",
+ ":base64_ssse3",
+ ]
+ } else {
+ sources += [
+ "base64/lib/arch/avx/avx_codec.c",
+ "base64/lib/arch/avx2/avx2_codec.c",
+ "base64/lib/arch/sse41/sse41_codec.c",
+ "base64/lib/arch/sse42/sse42_codec.c",
+ "base64/lib/arch/ssse3/ssse3_codec.c",
+ ]
+ }
+}
+
+source_set("base64_ssse3") {
+ public_configs = [ ":base64_config" ]
+
+ defines = [ "HAVE_SSSE3=1" ]
+
+ cflags = [ "-mssse3" ]
+ cflags_c = [ "-Wno-implicit-fallthrough" ]
+
+ sources = [ "base64/lib/arch/ssse3/ssse3_codec.c" ]
+}
+
+source_set("base64_sse41") {
+ public_configs = [ ":base64_config" ]
+
+ defines = [ "HAVE_SSE41=1" ]
+
+ cflags = [ "-msse4.1" ]
+ cflags_c = [ "-Wno-implicit-fallthrough" ]
+
+ sources = [ "base64/lib/arch/sse41/sse41_codec.c" ]
+}
+
+source_set("base64_sse42") {
+ public_configs = [ ":base64_config" ]
+
+ defines = [
+ "BASE64_STATIC_DEFINE",
+ "HAVE_SSE42=1",
+ ]
+
+ cflags = [ "-msse4.2" ]
+ cflags_c = [ "-Wno-implicit-fallthrough" ]
+
+ sources = [ "base64/lib/arch/sse42/sse42_codec.c" ]
+}
+
+source_set("base64_avx") {
+ public_configs = [ ":base64_config" ]
+
+ defines = [ "HAVE_AVX=1" ]
+
+ cflags = [ "-mavx" ]
+ cflags_c = [ "-Wno-implicit-fallthrough" ]
+
+ sources = [ "base64/lib/arch/avx/avx_codec.c" ]
+}
+
+source_set("base64_avx2") {
+ public_configs = [ ":base64_config" ]
+
+ defines = [ "HAVE_AVX2=1" ]
+
+ cflags = [ "-mavx2" ]
+ cflags_c = [
+ "-Wno-implicit-fallthrough",
+ "-Wno-implicit-function-declaration",
+ ]
+
+ sources = [ "base64/lib/arch/avx2/avx2_codec.c" ]
+}
+
+source_set("base64_neon32") {
+ public_configs = [ ":base64_config" ]
+
+ defines = [ "HAVE_NEON32=1" ]
+
+ cflags = [ "-mfpu=neon" ]
+ cflags_c = [ "-Wno-implicit-fallthrough" ]
+
+ sources = [ "base64/lib/arch/neon32/neon32_codec.c" ]
+}
+
+source_set("base64_neon64") {
+ public_configs = [ ":base64_config" ]
+
+ defines = [ "HAVE_NEON64=1" ]
+
+ cflags_c = [ "-Wno-implicit-fallthrough" ]
+
+ sources = [ "base64/lib/arch/neon64/neon64_codec.c" ]
+}
diff --git a/deps/base64/base64/lib/arch/avx/codec.c b/deps/base64/base64/lib/arch/avx/avx_codec.c
similarity index 100%
rename from deps/base64/base64/lib/arch/avx/codec.c
rename to deps/base64/base64/lib/arch/avx/avx_codec.c
diff --git a/deps/base64/base64/lib/arch/avx2/codec.c b/deps/base64/base64/lib/arch/avx2/avx2_codec.c
similarity index 100%
rename from deps/base64/base64/lib/arch/avx2/codec.c
rename to deps/base64/base64/lib/arch/avx2/avx2_codec.c
diff --git a/deps/base64/base64/lib/arch/neon32/codec.c b/deps/base64/base64/lib/arch/neon32/neon32_codec.c
similarity index 100%
rename from deps/base64/base64/lib/arch/neon32/codec.c
rename to deps/base64/base64/lib/arch/neon32/neon32_codec.c
diff --git a/deps/base64/base64/lib/arch/neon64/codec.c b/deps/base64/base64/lib/arch/neon64/neon64_codec.c
similarity index 100%
rename from deps/base64/base64/lib/arch/neon64/codec.c
rename to deps/base64/base64/lib/arch/neon64/neon64_codec.c
diff --git a/deps/base64/base64/lib/arch/sse41/codec.c b/deps/base64/base64/lib/arch/sse41/sse41_codec.c
similarity index 100%
rename from deps/base64/base64/lib/arch/sse41/codec.c
rename to deps/base64/base64/lib/arch/sse41/sse41_codec.c
diff --git a/deps/base64/base64/lib/arch/sse42/codec.c b/deps/base64/base64/lib/arch/sse42/sse42_codec.c
similarity index 100%
rename from deps/base64/base64/lib/arch/sse42/codec.c
rename to deps/base64/base64/lib/arch/sse42/sse42_codec.c
diff --git a/deps/base64/base64/lib/arch/ssse3/codec.c b/deps/base64/base64/lib/arch/ssse3/ssse3_codec.c
similarity index 100%
rename from deps/base64/base64/lib/arch/ssse3/codec.c
rename to deps/base64/base64/lib/arch/ssse3/ssse3_codec.c
diff --git a/deps/cares/BUILD.gn b/deps/cares/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..71a37834f4e693c190eb7e7d04e3f5ce67c487ad
@ -1006,10 +1192,10 @@ index 0000000000000000000000000000000000000000..2c9d2826c85bdd033f1df1d6188df636
+}
diff --git a/filenames.json b/filenames.json
new file mode 100644
index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15f6312138
index 0000000000000000000000000000000000000000..da2056ec2ab06924d64a3028646d983824263778
--- /dev/null
+++ b/filenames.json
@@ -0,0 +1,625 @@
@@ -0,0 +1,635 @@
+// This file is automatically generated by generate_gn_filenames_json.py
+// DO NOT EDIT
+{
@ -1197,6 +1383,7 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "lib/stream/consumers.js",
+ "lib/stream/promises.js",
+ "lib/stream/web.js",
+ "lib/readline/promises.js",
+ "lib/internal/constants.js",
+ "lib/internal/abort_controller.js",
+ "lib/internal/net.js",
@ -1211,6 +1398,7 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "lib/internal/histogram.js",
+ "lib/internal/error_serdes.js",
+ "lib/internal/dgram.js",
+ "lib/internal/structured_clone.js",
+ "lib/internal/child_process.js",
+ "lib/internal/assert.js",
+ "lib/internal/fixed_queue.js",
@ -1238,11 +1426,13 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "lib/internal/stream_base_commons.js",
+ "lib/internal/url.js",
+ "lib/internal/async_hooks.js",
+ "lib/internal/wasm_web_api.js",
+ "lib/internal/http.js",
+ "lib/internal/buffer.js",
+ "lib/internal/trace_events_async_hooks.js",
+ "lib/internal/v8/startup_snapshot.js",
+ "lib/internal/test_runner/test.js",
+ "lib/internal/test_runner/runner.js",
+ "lib/internal/test_runner/harness.js",
+ "lib/internal/test_runner/utils.js",
+ "lib/internal/test_runner/tap_stream.js",
@ -1282,9 +1472,8 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "lib/internal/webstreams/adapters.js",
+ "lib/internal/webstreams/transfer.js",
+ "lib/internal/bootstrap/loaders.js",
+ "lib/internal/bootstrap/pre_execution.js",
+ "lib/internal/bootstrap/node.js",
+ "lib/internal/bootstrap/environment.js",
+ "lib/internal/bootstrap/browser.js",
+ "lib/internal/bootstrap/switches/does_not_own_process_state.js",
+ "lib/internal/bootstrap/switches/is_not_main_thread.js",
+ "lib/internal/bootstrap/switches/does_own_process_state.js",
@ -1318,6 +1507,7 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "lib/internal/streams/duplex.js",
+ "lib/internal/streams/pipeline.js",
+ "lib/internal/readline/interface.js",
+ "lib/internal/readline/promises.js",
+ "lib/internal/readline/utils.js",
+ "lib/internal/readline/emitKeypressEvents.js",
+ "lib/internal/readline/callbacks.js",
@ -1326,6 +1516,7 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "lib/internal/repl/await.js",
+ "lib/internal/legacy/processbinding.js",
+ "lib/internal/assert/calltracker.js",
+ "lib/internal/assert/snapshot.js",
+ "lib/internal/assert/assertion_error.js",
+ "lib/internal/http2/util.js",
+ "lib/internal/http2/core.js",
@ -1335,7 +1526,6 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "lib/internal/per_context/domexception.js",
+ "lib/internal/vm/module.js",
+ "lib/internal/tls/secure-pair.js",
+ "lib/internal/tls/parse-cert-string.js",
+ "lib/internal/tls/secure-context.js",
+ "lib/internal/child_process/serialization.js",
+ "lib/internal/debugger/inspect_repl.js",
@ -1354,6 +1544,7 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "lib/internal/main/inspect.js",
+ "lib/internal/main/eval_stdin.js",
+ "lib/internal/main/run_main_module.js",
+ "lib/internal/main/environment.js",
+ "lib/internal/modules/run_main.js",
+ "lib/internal/modules/package_json_reader.js",
+ "lib/internal/modules/esm/module_job.js",
@ -1367,6 +1558,7 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "lib/internal/modules/esm/initialize_import_meta.js",
+ "lib/internal/modules/esm/module_map.js",
+ "lib/internal/modules/esm/get_format.js",
+ "lib/internal/modules/esm/package_config.js",
+ "lib/internal/modules/esm/formats.js",
+ "lib/internal/modules/esm/loader.js",
+ "lib/internal/modules/cjs/helpers.js",
@ -1374,6 +1566,7 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "lib/internal/source_map/source_map.js",
+ "lib/internal/source_map/prepare_stack_trace.js",
+ "lib/internal/source_map/source_map_cache.js",
+ "lib/internal/dns/callback_resolver.js",
+ "lib/internal/dns/promises.js",
+ "lib/internal/dns/utils.js",
+ "lib/internal/fs/watchers.js",
@ -1403,6 +1596,7 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "lib/internal/process/warning.js",
+ "lib/internal/process/policy.js",
+ "lib/internal/process/promises.js",
+ "lib/internal/process/pre_execution.js",
+ "lib/internal/process/signal.js",
+ "lib/internal/process/execution.js",
+ "lib/internal/process/esm_loader.js",
@ -1441,6 +1635,7 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "src/api/utils.cc",
+ "src/async_wrap.cc",
+ "src/cares_wrap.cc",
+ "src/cleanup_queue.cc",
+ "src/connect_wrap.cc",
+ "src/connection_wrap.cc",
+ "src/debug_utils.cc",
@ -1463,6 +1658,7 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "src/node_binding.cc",
+ "src/node_blob.cc",
+ "src/node_buffer.cc",
+ "src/node_builtins.cc",
+ "src/node_config.cc",
+ "src/node_constants.cc",
+ "src/node_contextify.cc",
@ -1478,8 +1674,6 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "src/node_main_instance.cc",
+ "src/node_messaging.cc",
+ "src/node_metadata.cc",
+ "src/node_native_module.cc",
+ "src/node_native_module_env.cc",
+ "src/node_options.cc",
+ "src/node_os.cc",
+ "src/node_perf.cc",
@ -1504,6 +1698,7 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "src/node_util.cc",
+ "src/node_v8.cc",
+ "src/node_wasi.cc",
+ "src/node_wasm_web_api.cc",
+ "src/node_watchdog.cc",
+ "src/node_worker.cc",
+ "src/node_zlib.cc",
@ -1539,6 +1734,8 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "src/base64-inl.h",
+ "src/callback_queue.h",
+ "src/callback_queue-inl.h",
+ "src/cleanup_queue.h",
+ "src/cleanup_queue-inl.h",
+ "src/connect_wrap.h",
+ "src/connection_wrap.h",
+ "src/debug_utils.h",
@ -1561,6 +1758,7 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "src/node_binding.h",
+ "src/node_blob.h",
+ "src/node_buffer.h",
+ "src/node_builtins.h",
+ "src/node_constants.h",
+ "src/node_context_data.h",
+ "src/node_contextify.h",
@ -1581,8 +1779,6 @@ index 0000000000000000000000000000000000000000..13fd1469ef0aa33853ddc6f31eda5b15
+ "src/node_messaging.h",
+ "src/node_metadata.h",
+ "src/node_mutex.h",
+ "src/node_native_module.h",
+ "src/node_native_module_env.h",
+ "src/node_object_wrap.h",
+ "src/node_options.h",
+ "src/node_options-inl.h",
@ -1876,7 +2072,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 aea46f3dad19d604d76b6726ce46141be48746c4..8620780de82f08940c40bddc449d281e4e348736 100644
index 5403dd847814737132dfd004daddee0efc1bc34d..eba54c354ae930ce957a150bc52d78c4dc6b8322 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -89,7 +89,10 @@
@ -1885,7 +2081,7 @@ index aea46f3dad19d604d76b6726ce46141be48746c4..8620780de82f08940c40bddc449d281e
*/
+// Electron sets NODE_MODULE_VERSION in their GN configuration
+#ifndef NODE_MODULE_VERSION
#define NODE_MODULE_VERSION 93
#define NODE_MODULE_VERSION 108
+#endif
// The NAPI_VERSION provided by this version of the runtime. This is the version
@ -2003,10 +2199,10 @@ index 0000000000000000000000000000000000000000..2a92eccfa582df361f2a889c0d9b32c1
+
+ out_file.writelines(new_contents)
diff --git a/tools/install.py b/tools/install.py
index a6d1f8b3caa8e24148b1930ea109508f8e612735..c80c1b8202ba59bd63340baca36df8bca5e1f81d 100755
index 9d5f4a48bca2c926b3ffb3c51c070222d4f7ce7b..728b8596b348b827dbc279498123053aea446ff3 100755
--- a/tools/install.py
+++ b/tools/install.py
@@ -202,17 +202,72 @@ def files(action):
@@ -202,60 +202,72 @@ def files(action):
def headers(action):
def wanted_v8_headers(files_arg, dest):
v8_headers = [
@ -2015,10 +2211,53 @@ index a6d1f8b3caa8e24148b1930ea109508f8e612735..c80c1b8202ba59bd63340baca36df8bc
- 'deps/v8/include/libplatform/libplatform-export.h',
- 'deps/v8/include/libplatform/v8-tracing.h',
- 'deps/v8/include/v8.h',
- 'deps/v8/include/v8-array-buffer.h',
- 'deps/v8/include/v8-callbacks.h',
- 'deps/v8/include/v8-container.h',
- 'deps/v8/include/v8-context.h',
- 'deps/v8/include/v8-data.h',
- 'deps/v8/include/v8-date.h',
- 'deps/v8/include/v8-debug.h',
- 'deps/v8/include/v8-embedder-heap.h',
- 'deps/v8/include/v8-embedder-state-scope.h',
- 'deps/v8/include/v8-exception.h',
- 'deps/v8/include/v8-extension.h',
- 'deps/v8/include/v8-external.h',
- 'deps/v8/include/v8-forward.h',
- 'deps/v8/include/v8-function-callback.h',
- 'deps/v8/include/v8-function.h',
- 'deps/v8/include/v8-initialization.h',
- 'deps/v8/include/v8-internal.h',
- 'deps/v8/include/v8-isolate.h',
- 'deps/v8/include/v8-json.h',
- 'deps/v8/include/v8-local-handle.h',
- 'deps/v8/include/v8-locker.h',
- 'deps/v8/include/v8-maybe.h',
- 'deps/v8/include/v8-memory-span.h',
- 'deps/v8/include/v8-message.h',
- 'deps/v8/include/v8-microtask-queue.h',
- 'deps/v8/include/v8-microtask.h',
- 'deps/v8/include/v8-object.h',
- 'deps/v8/include/v8-persistent-handle.h',
- 'deps/v8/include/v8-platform.h',
- 'deps/v8/include/v8-primitive-object.h',
- 'deps/v8/include/v8-primitive.h',
- 'deps/v8/include/v8-profiler.h',
- 'deps/v8/include/v8-promise.h',
- 'deps/v8/include/v8-proxy.h',
- 'deps/v8/include/v8-regexp.h',
- 'deps/v8/include/v8-script.h',
- 'deps/v8/include/v8-snapshot.h',
- 'deps/v8/include/v8-statistics.h',
- 'deps/v8/include/v8-template.h',
- 'deps/v8/include/v8-traced-handle.h',
- 'deps/v8/include/v8-typed-array.h',
- 'deps/v8/include/v8-unwinder.h',
- 'deps/v8/include/v8-value-serializer.h',
- 'deps/v8/include/v8-value.h',
- 'deps/v8/include/v8-version.h',
- 'deps/v8/include/v8-wasm.h',
- 'deps/v8/include/v8-weak-callback-info.h',
- 'deps/v8/include/v8config.h',
+ '../../v8/include/cppgc/common.h',
+ '../../v8/include/libplatform/libplatform.h',
@ -2089,7 +2328,7 @@ index a6d1f8b3caa8e24148b1930ea109508f8e612735..c80c1b8202ba59bd63340baca36df8bc
files_arg = [name for name in files_arg if name in v8_headers]
action(files_arg, dest)
@@ -239,7 +294,7 @@ def headers(action):
@@ -282,7 +294,7 @@ def headers(action):
if sys.platform.startswith('aix'):
action(['out/Release/node.exp'], 'include/node/')
@ -2099,7 +2338,7 @@ index a6d1f8b3caa8e24148b1930ea109508f8e612735..c80c1b8202ba59bd63340baca36df8bc
if 'false' == variables.get('node_shared_libuv'):
subdir_files('deps/uv/include', 'include/node/', action)
diff --git a/tools/js2c.py b/tools/js2c.py
index d93be2123e0f8c75dd6a0041ef164982db0860e4..4d9317527d46ac8c6d8066bfba707233053b8615 100755
index e295949a18508d7989f0925093a9dd6a284fecd6..8ba46c5d78c5c86d9f7b8b6972f3febbe87de61e 100755
--- a/tools/js2c.py
+++ b/tools/js2c.py
@@ -131,6 +131,14 @@ def NormalizeFileName(filename):