From af0b3d85353853ec8f70d1b46abc9e5d837fad60 Mon Sep 17 00:00:00 2001
From: Attila Klenik <a.klenik@gmail.com>
Date: Tue, 30 Sep 2025 10:46:47 +0200
Subject: [PATCH] fix: NPM publishing with workspaces (#1714)

* tell the npm config command explicitly that it does not operate with workspaces
* set root package to private to prevent accidental publishing of monorepo
* updated git repo naming format in package.json files
* remove generator-caliper from integration test and publishing, pending removal of package itself

Signed-off-by: Attila Klenik <a.klenik@gmail.com>
---
 .github/workflows/integration-tests.yml           | 9 ---------
 package.json                                      | 1 +
 packages/caliper-cli/package.json                 | 2 +-
 packages/caliper-core/package.json                | 2 +-
 packages/caliper-fabric/package.json              | 2 +-
 packages/caliper-publish/artifacts/npm-publish.sh | 3 ++-
 packages/caliper-publish/lib/impl/npm.js          | 3 +--
 packages/generator-caliper/package.json           | 2 +-
 8 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 3f085a2e4..f1fc934fd 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -25,15 +25,6 @@ jobs:
             - 'packages/caliper-tests-integration/fabric_tests/**'
             - '.github/workflows/integration-tests.yml'
             - 'package-lock.json'
-          generator:
-            - 'packages/caliper-cli/**'
-            - 'packages/caliper-core/**'
-            - 'packages/caliper-fabric/**'
-            - 'packages/generator-caliper/**'
-            - 'packages/caliper-publish/**'
-            - 'packages/caliper-tests-integration/generator_tests/**'
-            - '.github/workflows/integration-tests.yml'
-            - 'package-lock.json'
 
   integration-tests:
     needs: changes
diff --git a/package.json b/package.json
index 4291a5bf9..c4a9a4cc4 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
         "type": "git",
         "url": "https://github.com/hyperledger-caliper/caliper"
     },
+    "private": true,
     "scripts": {
         "pretest": "npm run licchk --workspaces",
         "licchk": "license-check-and-add",
diff --git a/packages/caliper-cli/package.json b/packages/caliper-cli/package.json
index 8b77273c3..6776efd9e 100644
--- a/packages/caliper-cli/package.json
+++ b/packages/caliper-cli/package.json
@@ -4,7 +4,7 @@
     "version": "0.6.1-unstable",
     "repository": {
         "type": "git",
-        "url": "https://github.com/hyperledger-caliper/caliper",
+        "url": "git+https://github.com/hyperledger-caliper/caliper.git",
         "directory": "packages/caliper-cli"
     },
     "bin": {
diff --git a/packages/caliper-core/package.json b/packages/caliper-core/package.json
index 3fcc9eecc..75014adf2 100644
--- a/packages/caliper-core/package.json
+++ b/packages/caliper-core/package.json
@@ -4,7 +4,7 @@
     "version": "0.6.1-unstable",
     "repository": {
         "type": "git",
-        "url": "https://github.com/hyperledger-caliper/caliper",
+        "url": "git+https://github.com/hyperledger-caliper/caliper.git",
         "directory": "packages/caliper-core"
     },
     "publishConfig": {
diff --git a/packages/caliper-fabric/package.json b/packages/caliper-fabric/package.json
index 0efe38b1f..7d4966c4b 100644
--- a/packages/caliper-fabric/package.json
+++ b/packages/caliper-fabric/package.json
@@ -4,7 +4,7 @@
     "version": "0.6.1-unstable",
     "repository": {
         "type": "git",
-        "url": "https://github.com/hyperledger-caliper/caliper",
+        "url": "git+https://github.com/hyperledger-caliper/caliper.git",
         "directory": "packages/caliper-fabric"
     },
     "publishConfig": {
diff --git a/packages/caliper-publish/artifacts/npm-publish.sh b/packages/caliper-publish/artifacts/npm-publish.sh
index 747949309..18e49f2e7 100755
--- a/packages/caliper-publish/artifacts/npm-publish.sh
+++ b/packages/caliper-publish/artifacts/npm-publish.sh
@@ -15,6 +15,7 @@
 
 # Exit on first error, print all commands.
 set -e
+set -x
 set -o pipefail
 
 # Set ARCH
@@ -23,7 +24,7 @@ ARCH=`uname -m`
 if [[ -z "${NPM_REGISTRY}" ]]
 then
     # Set the public NPM registry as default
-    npm config set registry https://registry.npmjs.org/
+    npm --workspaces=false config set registry https://registry.npmjs.org/
 fi
 
 npm publish --access public ${NPM_REGISTRY} ${DRY_RUN} --tag ${TAG}
diff --git a/packages/caliper-publish/lib/impl/npm.js b/packages/caliper-publish/lib/impl/npm.js
index 00453869d..be29da247 100644
--- a/packages/caliper-publish/lib/impl/npm.js
+++ b/packages/caliper-publish/lib/impl/npm.js
@@ -21,8 +21,7 @@ const utils = require('./../utils/cmdutils');
 const packages = [
     'caliper-core',
     'caliper-fabric',
-    'caliper-cli',
-    'generator-caliper'
+    'caliper-cli'
 ];
 
 // impl => lib => caliper-publish
diff --git a/packages/generator-caliper/package.json b/packages/generator-caliper/package.json
index d2505e6bd..6c26d71a8 100644
--- a/packages/generator-caliper/package.json
+++ b/packages/generator-caliper/package.json
@@ -6,7 +6,7 @@
     "homepage": "https://hyperledger-caliper.github.io/caliper/",
     "repository": {
         "type": "git",
-        "url": "https://github.com/hyperledger-caliper/caliper"
+        "url": "git+https://github.com/hyperledger-caliper/caliper.git"
     },
     "main": "generators/callback/index.js",
     "keywords": [