esm: js-string Wasm builtins in ESM Integration

codebytere · codebytere · commit 23e77935148c · 2025-09-02T10:09:41.000+02:00
nodejs/node#59179
diff --git a/patches/node/.patches b/patches/node/.patches
@@ -30,7 +30,7 @@ build_compile_with_c_20_support.patch
 add_v8_taskpirority_to_foreground_task_runner_signature.patch
 cli_remove_deprecated_v8_flag.patch
 build_restore_clang_as_default_compiler_on_macos.patch
-fix_remove_harmony-import-assertions_from_node_cc.patch
+fix_remove_outdated_v8_flags_from_node_cc.patch
 chore_disable_deprecation_ftbfs_in_simdjson_header.patch
 build_allow_unbundling_of_node_js_dependencies.patch
 test_use_static_method_names_in_call_stacks.patch
diff --git a/patches/node/cli_move_--trace-atomics-wait_to_eol.patch b/patches/node/cli_move_--trace-atomics-wait_to_eol.patch
@@ -83,7 +83,7 @@ index 6913992a5476d2317a34fb69d3c6af63b686f9a6..1faef5ba1d4206a5cc4c71cb71f7a08f
  Print stack traces for deprecations.
  .
 diff --git a/src/node.cc b/src/node.cc
-index 443c351d67a3efb3aece3480e2e21558b335120a..2f373662006a74b751bfd259863d8ca5373fddf3 100644
+index 0d383dcdb80fe30e3c2d6880b44f626f065bb1f3..9d9992dacbc595c987827f55eb12ea8af0480df6 100644
 --- a/src/node.cc
 +++ b/src/node.cc
 @@ -232,44 +232,6 @@ void Environment::WaitForInspectorFrontendByOptions() {
diff --git a/patches/node/fix_cppgc_initializing_twice.patch b/patches/node/fix_cppgc_initializing_twice.patch
@@ -12,7 +12,7 @@ This can be removed/refactored once Node.js upgrades to a version of V8
 containing the above CL.
 
 diff --git a/src/node.cc b/src/node.cc
-index 2f373662006a74b751bfd259863d8ca5373fddf3..23fc21e450963284edb2495166b4f5d7d0bf0a72 100644
+index 9d9992dacbc595c987827f55eb12ea8af0480df6..d43a88b8780f04d186485a2dc58ad07083e699ac 100644
 --- a/src/node.cc
 +++ b/src/node.cc
 @@ -1222,7 +1222,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
diff --git a/patches/node/fix_remove_harmony-import-assertions_from_node_cc.patch b/patches/node/fix_remove_harmony-import-assertions_from_node_cc.patch
diff --git a/patches/node/fix_remove_outdated_v8_flags_from_node_cc.patch b/patches/node/fix_remove_outdated_v8_flags_from_node_cc.patch
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shelley Vohr <shelley.vohr@gmail.com>
+Date: Fri, 18 Oct 2024 17:01:06 +0200
+Subject: fix: remove outdated V8 flags from node.cc
+
+Refs https://chromium-review.googlesource.com/c/v8/v8/+/5507047
+Refs https://chromium-review.googlesource.com/c/v8/v8/+/6249026
+
+The above CL removes the `--harmony-import-assertions` and
+--experimental-wasm-memory64 flags from V8.
+
+This patch can be removed when we upgrade to a V8 version that
+contains the above CLs.
+
+diff --git a/src/node.cc b/src/node.cc
+index 1b5e989e5456a9bf77475e06250702029568c08d..61d65094aebd7f3016d51a8e7c9c761fc69cecba 100644
+--- a/src/node.cc
++++ b/src/node.cc
+@@ -816,7 +816,7 @@ static ExitCode ProcessGlobalArgsInternal(std::vector<std::string>* args,
+   }
+   // TODO(nicolo-ribaudo): remove this once V8 doesn't enable it by default
+   // anymore.
+-  v8_args.emplace_back("--no-harmony-import-assertions");
++  // v8_args.emplace_back("--no-harmony-import-assertions");
+ 
+   auto env_opts = per_process::cli_options->per_isolate->per_env;
+   if (std::find(v8_args.begin(), v8_args.end(),
+@@ -828,7 +828,7 @@ static ExitCode ProcessGlobalArgsInternal(std::vector<std::string>* args,
+ 
+   // Support stable Phase 5 WebAssembly proposals
+   v8_args.emplace_back("--experimental-wasm-imported-strings");
+-  v8_args.emplace_back("--experimental-wasm-memory64");
++  // v8_args.emplace_back("--experimental-wasm-memory64");
+   v8_args.emplace_back("--experimental-wasm-exnref");
+ 
+ #ifdef __POSIX__
diff --git a/patches/node/refactor_attach_cppgc_heap_on_v8_isolate_creation.patch b/patches/node/refactor_attach_cppgc_heap_on_v8_isolate_creation.patch
@@ -102,7 +102,7 @@ index 1079e3beb02e5f5d71a15fd2db65cb93ebd175d6..a7be609c3ab9093cec5145367b95ae68
    worker::Worker* worker_context_ = nullptr;
    PerIsolateWrapperData* wrapper_data_;
 diff --git a/src/node.cc b/src/node.cc
-index b47ed0dafebbc9c344e0b72fe1435a136f70e8b3..443c351d67a3efb3aece3480e2e21558b335120a 100644
+index 61d65094aebd7f3016d51a8e7c9c761fc69cecba..0d383dcdb80fe30e3c2d6880b44f626f065bb1f3 100644
 --- a/src/node.cc
 +++ b/src/node.cc
 @@ -1271,6 +1271,14 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ index 6913992a5476d2317a34fb69d3c6af63b686f9a6..1faef5ba1d4206a5cc4c71cb71f7a08f`
`83`	`83`	`Print stack traces for deprecations.`
`84`	`84`	`.`
`85`	`85`	`diff --git a/src/node.cc b/src/node.cc`
`86`		`-index 443c351d67a3efb3aece3480e2e21558b335120a..2f373662006a74b751bfd259863d8ca5373fddf3 100644`
	`86`	`+index 0d383dcdb80fe30e3c2d6880b44f626f065bb1f3..9d9992dacbc595c987827f55eb12ea8af0480df6 100644`
`87`	`87`	`--- a/src/node.cc`
`88`	`88`	`+++ b/src/node.cc`
`89`	`89`	`@@ -232,44 +232,6 @@ void Environment::WaitForInspectorFrontendByOptions() {`