From a8a6b6972c6ce9b426fdf033d4d7dcfc9eeaf0e2 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Wed, 25 Feb 2026 16:09:07 +0100
Subject: [PATCH] build: fix GN for new merve dep

---
 deps/merve/BUILD.gn       | 14 ++++++++++++++
 deps/merve/unofficial.gni | 20 ++++++++++++++++++++
 node.gni                  |  2 --
 unofficial.gni            |  1 +
 4 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 deps/merve/BUILD.gn
 create mode 100644 deps/merve/unofficial.gni

diff --git a/deps/merve/BUILD.gn b/deps/merve/BUILD.gn
new file mode 100644
index 00000000000000..7bb318f8835dba
--- /dev/null
+++ b/deps/merve/BUILD.gn
@@ -0,0 +1,14 @@
+##############################################################################
+#                                                                            #
+#                       DO NOT EDIT THIS FILE!                               #
+#                                                                            #
+##############################################################################
+
+# This file is used by GN for building, which is NOT the build system used for
+# building official binaries.
+# Please modify the gyp files if you are making changes to build system.
+
+import("unofficial.gni")
+
+merve_gn_build("merve") {
+}
diff --git a/deps/merve/unofficial.gni b/deps/merve/unofficial.gni
new file mode 100644
index 00000000000000..dfb508d1d22f84
--- /dev/null
+++ b/deps/merve/unofficial.gni
@@ -0,0 +1,20 @@
+# This file is used by GN for building, which is NOT the build system used for
+# building official binaries.
+# Please edit the gyp files if you are making changes to build system.
+
+# The actual configurations are put inside a template in unofficial.gni to
+# prevent accidental edits from contributors.
+template("merve_gn_build") {
+  config("merve_config") {
+    include_dirs = [ "." ]
+  }
+  gypi_values = exec_script("../../tools/gypi_to_gn.py",
+                            [ rebase_path("merve.gyp") ],
+                            "scope",
+                            [ "merve.gyp" ])
+  source_set(target_name) {
+    forward_variables_from(invoker, "*")
+    public_configs = [ ":merve_config" ]
+    sources = gypi_values.merve_sources
+  }
+}
diff --git a/node.gni b/node.gni
index d4438f7fd61598..41f200189a34e1 100644
--- a/node.gni
+++ b/node.gni
@@ -26,8 +26,6 @@ declare_args() {
   # TODO(zcbenz): This is currently copied from configure.py, we should share
   # the list between configure.py and GN configurations.
   node_builtin_shareable_builtins = [
-    "deps/cjs-module-lexer/lexer.js",
-    "deps/cjs-module-lexer/dist/lexer.js",
     "deps/undici/undici.js",
     "deps/amaro/dist/index.js",
   ]
diff --git a/unofficial.gni b/unofficial.gni
index f654a15da347a3..aa78f9ce60c043 100644
--- a/unofficial.gni
+++ b/unofficial.gni
@@ -160,6 +160,7 @@ template("node_gn_build") {
       "deps/cares",
       "deps/histogram",
       "deps/llhttp",
+      "deps/merve",
       "deps/nbytes",
       "deps/nghttp2",
       "deps/ngtcp2",