From a1d2ced6fc2317d36bc917c5d0ac339bc647dc34 Mon Sep 17 00:00:00 2001
From: Max Romanov <max.romanov@nginx.com>
Date: Tue, 15 Jun 2021 10:35:15 +0300
Subject: Node.js: improving and test packaging.

The patch removes the "files" section from package.json to avoid future issues
with missing files.  For package testing purposes, 'npm pack' is used instead
of plain 'tar' to simulate packaging more accurately.
---
 auto/modules/nodejs               |  7 +++++--
 src/nodejs/unit-http/package.json | 22 ----------------------
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/auto/modules/nodejs b/auto/modules/nodejs
index b2309143..7d4f8581 100644
--- a/auto/modules/nodejs
+++ b/auto/modules/nodejs
@@ -157,6 +157,7 @@ ${NXT_NODE}-copy: ${NXT_NODE_VERSION_FILE} ${NXT_NODE_PACKAGE_FILE}
 	mkdir -p ${NXT_NODE_TMP}
 	cp -rp src/nodejs/unit-http/* ${NXT_NODE_TMP}/
 	cp -p ${NXT_NODE_VERSION_FILE} ${NXT_NODE_PACKAGE_FILE} ${NXT_NODE_TMP}/
+	rm -f ${NXT_NODE_TMP}/binding_pub.gyp
 
 ${NXT_NODE}-copy-g: ${NXT_NODE_VERSION_FILE} ${NXT_NODE_PACKAGE_FILE}
 	mkdir -p ${NXT_NODE_TMP_G}
@@ -174,10 +175,12 @@ ${NXT_NODE_PACKAGE_FILE}: ${NXT_VERSION_H} src/nodejs/unit-http/package.json
 		src/nodejs/unit-http/package.json > ${NXT_NODE_PACKAGE_FILE}
 
 ${NXT_NODE_TARBALL}: ${NXT_NODE}-copy
-	tar -zcvf ${NXT_NODE_TARBALL} -C ${NXT_NODE_TMP} .
+	cd ${NXT_NODE_TMP} && npm pack
+	mv ${NXT_NODE_TMP}/unit-http-\$(NXT_VERSION).tgz ${NXT_NODE_TARBALL}
 
 ${NXT_NODE_TARBALL_G}: ${NXT_NODE}-copy-g
-	tar -zcvf ${NXT_NODE_TARBALL_G} -C ${NXT_NODE_TMP_G} .
+	cd ${NXT_NODE_TMP_G} && npm pack
+	mv ${NXT_NODE_TMP_G}/unit-http-\$(NXT_VERSION).tgz ${NXT_NODE_TARBALL_G}
 
 
 install: ${NXT_NODE}-$NXT_NODE_INSTALL
diff --git a/src/nodejs/unit-http/package.json b/src/nodejs/unit-http/package.json
index f0afe41c..debbd492 100644
--- a/src/nodejs/unit-http/package.json
+++ b/src/nodejs/unit-http/package.json
@@ -3,28 +3,6 @@
     "version": "%%VERSION%%",
     "description": "HTTP module for NGINX Unit",
     "main": "http.js",
-    "files": [
-        "unit.h",
-        "version.h",
-        "addon.cpp",
-        "unit.cpp",
-        "http.js",
-        "http_server.js",
-        "loader.js",
-        "loader.mjs",
-        "nxt_napi.h",
-        "package.json",
-        "socket.js",
-        "binding.gyp",
-        "README.md",
-        "websocket.js",
-        "websocket_connection.js",
-        "websocket_frame.js",
-        "websocket_request.js",
-        "websocket_router.js",
-        "websocket_router_request.js",
-        "websocket_server.js"
-    ],
     "scripts": {
         "clean": "node-gyp clean",
         "configure": "node-gyp configure",
-- 
cgit