From 73b27c7a301125b17e421b2be835f3db13eb8007 Mon Sep 17 00:00:00 2001
From: Timothy Johnson <timothy.johnson@broadcom.com>
Date: Tue, 24 Dec 2024 10:02:32 -0500
Subject: [PATCH 1/3] Update workflows and deps for technical currency

Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
---
 .github/workflows/main.yml | 4 ++--
 package-lock.json          | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a323f207..23f71dec 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [18.x, 20.x, 22.x]
         os: [windows-latest, ubuntu-latest, macos-latest]
 
     env:
@@ -143,4 +143,4 @@ jobs:
         OVSX_PAT: ${{ secrets.VSCODE_OVSX_PUBLISHER_TOKEN }}
         VSCE_PAT: ${{ secrets.VSCODE_VSCE_PUBLISHER_TOKEN }}
       with:
-        config-dir: .github
\ No newline at end of file
+        config-dir: .github
diff --git a/package-lock.json b/package-lock.json
index d73e16b7..b2182a78 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10899,9 +10899,9 @@
       "optional": true
     },
     "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
       "dev": true,
       "funding": [
         {
@@ -10909,6 +10909,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },

From 966af6b5a19e5ba48a7e3aeca7c295a6d1588e24 Mon Sep 17 00:00:00 2001
From: Timothy Johnson <timothy.johnson@broadcom.com>
Date: Thu, 2 Jan 2025 15:52:04 -0500
Subject: [PATCH 2/3] Remove prepack and postpack scripts

Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
---
 packages/cli/package.json |  4 +---
 scripts/bundleTgz.js      | 12 ++----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index e9d3a6bb..ef9d723c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -37,9 +37,7 @@
     "lint": "eslint \"src/**/*.ts\" \"**/__tests__/**/*.ts\"",
     "lint:src": "eslint \"src/**/*.ts\" --ignore-pattern \"**/__tests__/**/*.ts\"",
     "lint:tests": "eslint \"**/__tests__/**/*.ts\"",
-    "prepack": "node ../../scripts/bundleTgz.js",
-    "postpack": "node ../../scripts/bundleTgz.js post",
-    "package": "npm pack --pack-destination=../../dist",
+    "package": "npm run prepublishOnly && node ../../scripts/bundleTgz.js",
     "test": "npm run test:unit && npm run test:system",
     "test:system": "jest --config system.jest_config.ts",
     "test:unit": "jest --config unit.jest_config.ts",
diff --git a/scripts/bundleTgz.js b/scripts/bundleTgz.js
index f1f3b941..acd4f132 100644
--- a/scripts/bundleTgz.js
+++ b/scripts/bundleTgz.js
@@ -14,8 +14,6 @@ const fsE = require("fs-extra");
 const fs = require("fs");
 const path = require("path");
 
-const isPost = process.argv[2] === "post";
-
 // Workaround for https://github.com/npm/cli/issues/3466
 const rootDir = path.join(__dirname, "..");
 process.chdir(rootDir);
@@ -38,11 +36,6 @@ const cleanUp = () => {
     fs.rmSync(path.join(rootDir, "npm-shrinkwrap.json"), { force: true });
 }
 
-if (isPost) {
-    cleanUp();
-    return;
-}
-
 if (fs.existsSync(path.join(cliPkgDir, "node_modules"))) {
     fsE.renameSync(path.join(cliPkgDir, "node_modules"), path.join(cliPkgDir, "node_modules_old"));
 }
@@ -72,8 +65,7 @@ try {
     ];
     fsE.writeFileSync(pkgJsonFile, JSON.stringify(pkgJson, null, 2));
 
-    // execCmd("npm pack --pack-destination=../../dist");
-} catch (err) {
+    execCmd("npm pack --pack-destination=../../dist");
+} finally {
     cleanUp();
-    throw err;
 }

From fccb2b743bd05214166900d240464c253ff7a1ab Mon Sep 17 00:00:00 2001
From: Timothy Johnson <timothy.johnson@broadcom.com>
Date: Thu, 2 Jan 2025 15:52:10 -0500
Subject: [PATCH 3/3] Update CLI changelog

Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
---
 packages/cli/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
index 6f5e4ace..59656ccb 100644
--- a/packages/cli/CHANGELOG.md
+++ b/packages/cli/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the IBM® CICS® Plug-in for Zowe CLI will be documented in this file.
 
+## Recent Changes
+
+- BugFix: Removed bundled dependencies from npm package and restored the npm-shrinkwrap file. [#187](https://github.com/zowe/cics-for-zowe-client/pull/187)
+
 ## `6.0.0`
 
 - MAJOR: v6.0.0 release