From 8aa0312496d0f263e86f28d7cca42bc42da48792 Mon Sep 17 00:00:00 2001
From: Ole-Martin Bratteng <1681525+omBratteng@users.noreply.github.com>
Date: Thu, 16 May 2024 13:01:51 +0200
Subject: [PATCH 1/5] Exclude node headers

---
 nodejs/BUILD                       | 1 +
 nodejs/testdata/check_headers.yaml | 5 +++++
 private/remote/node_archive.bzl    | 3 +++
 3 files changed, 9 insertions(+)
 create mode 100644 nodejs/testdata/check_headers.yaml

diff --git a/nodejs/BUILD b/nodejs/BUILD
index 263927036..2213b027f 100644
--- a/nodejs/BUILD
+++ b/nodejs/BUILD
@@ -54,6 +54,7 @@ USER = [
         configs = [
             "testdata/nodejs" + major_version + ".yaml",
             "testdata/check_npm.yaml",
+			"testdata/check_headers.yaml"
         ],
         image = "nodejs" + major_version + ("" if (not mode) else mode) + "_" + user + "_" + arch + "_" + distro,
         tags = [
diff --git a/nodejs/testdata/check_headers.yaml b/nodejs/testdata/check_headers.yaml
new file mode 100644
index 000000000..d32ee4066
--- /dev/null
+++ b/nodejs/testdata/check_headers.yaml
@@ -0,0 +1,5 @@
+schemaVersion: "2.0.0"
+fileExistenceTests:
+  - name: npm
+    path: '/nodejs/include/node/node.h'
+    shouldExist: false
diff --git a/private/remote/node_archive.bzl b/private/remote/node_archive.bzl
index e020120a0..1a075642b 100644
--- a/private/remote/node_archive.bzl
+++ b/private/remote/node_archive.bzl
@@ -16,6 +16,9 @@ pkg_tar(
             "output/bin/corepack",
             "output/bin/npm",
             "output/bin/npx",
+            "output/CHANGELOG.md",
+            "output/README.md",
+            "output/include/**",
         ],
     ),
     package_dir = "/nodejs",

From c0f3943f2948834d1bf02aa478e3acc55088911a Mon Sep 17 00:00:00 2001
From: Ole-Martin Bratteng <1681525+omBratteng@users.noreply.github.com>
Date: Thu, 16 May 2024 13:03:12 +0200
Subject: [PATCH 2/5] Fix indentations

---
 nodejs/BUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nodejs/BUILD b/nodejs/BUILD
index 2213b027f..e9e8c0fea 100644
--- a/nodejs/BUILD
+++ b/nodejs/BUILD
@@ -54,7 +54,7 @@ USER = [
         configs = [
             "testdata/nodejs" + major_version + ".yaml",
             "testdata/check_npm.yaml",
-			"testdata/check_headers.yaml"
+            "testdata/check_headers.yaml"
         ],
         image = "nodejs" + major_version + ("" if (not mode) else mode) + "_" + user + "_" + arch + "_" + distro,
         tags = [

From 4eb18dd460263c8caec4d0fdb7d57349f8958921 Mon Sep 17 00:00:00 2001
From: Ole-Martin Bratteng <1681525+omBratteng@users.noreply.github.com>
Date: Thu, 16 May 2024 13:06:20 +0200
Subject: [PATCH 3/5] Fix order

---
 nodejs/BUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nodejs/BUILD b/nodejs/BUILD
index e9e8c0fea..8a8386507 100644
--- a/nodejs/BUILD
+++ b/nodejs/BUILD
@@ -53,8 +53,8 @@ USER = [
         name = "nodejs" + major_version + ("" if (not mode) else mode) + "_" + user + "_" + arch + "_" + distro + "_test",
         configs = [
             "testdata/nodejs" + major_version + ".yaml",
-            "testdata/check_npm.yaml",
             "testdata/check_headers.yaml"
+            "testdata/check_npm.yaml",
         ],
         image = "nodejs" + major_version + ("" if (not mode) else mode) + "_" + user + "_" + arch + "_" + distro,
         tags = [

From 771143231922409e9c6940a5123a0e110503ee0c Mon Sep 17 00:00:00 2001
From: Ole-Martin Bratteng <1681525+omBratteng@users.noreply.github.com>
Date: Thu, 16 May 2024 13:08:41 +0200
Subject: [PATCH 4/5] Another fix

---
 nodejs/BUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nodejs/BUILD b/nodejs/BUILD
index 8a8386507..b5969123a 100644
--- a/nodejs/BUILD
+++ b/nodejs/BUILD
@@ -53,7 +53,7 @@ USER = [
         name = "nodejs" + major_version + ("" if (not mode) else mode) + "_" + user + "_" + arch + "_" + distro + "_test",
         configs = [
             "testdata/nodejs" + major_version + ".yaml",
-            "testdata/check_headers.yaml"
+            "testdata/check_headers.yaml",
             "testdata/check_npm.yaml",
         ],
         image = "nodejs" + major_version + ("" if (not mode) else mode) + "_" + user + "_" + arch + "_" + distro,

From fdd0b4807748299a73305fe35363a429d6ce650f Mon Sep 17 00:00:00 2001
From: Ole-Martin Bratteng <1681525+omBratteng@users.noreply.github.com>
Date: Thu, 16 May 2024 13:27:10 +0200
Subject: [PATCH 5/5] Change it to only include license and binary

---
 private/remote/node_archive.bzl | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/private/remote/node_archive.bzl b/private/remote/node_archive.bzl
index 1a075642b..0aac37657 100644
--- a/private/remote/node_archive.bzl
+++ b/private/remote/node_archive.bzl
@@ -9,16 +9,9 @@ load("@rules_pkg//:pkg.bzl", "pkg_tar")
 pkg_tar(
     name = "data",
     srcs = glob(
-        ["output/**/*"],
-        exclude = [
-            "output/lib/node_modules/corepack/**",
-            "output/lib/node_modules/npm/**",
-            "output/bin/corepack",
-            "output/bin/npm",
-            "output/bin/npx",
-            "output/CHANGELOG.md",
-            "output/README.md",
-            "output/include/**",
+        [
+            "output/bin/node",
+            "output/LICENSE",
         ],
     ),
     package_dir = "/nodejs",