Merge pull request #187 from zowe/chore/update-workflows-and-deps

Update workflows and deps for technical currency
zowe · Jan 3, 2025 · 84c31fb · 84c31fb
2 parents 39222b3 + fccb2b7
commit 84c31fb
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 18 deletions.
diff --git 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
+        config-dir: .github
diff --git a/package-lock.json b/package-lock.json
diff --git 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

diff --git 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
@@ -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;
 }