diff --git a/lerna.json b/lerna.json index 7d37acc2..a0933f7f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "5.0.4", + "version": "5.0.2", "command": { "publish": { "ignoreChanges": [ diff --git a/package-lock.json b/package-lock.json index 26a17a5f..6d0a9a86 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23039,13 +23039,13 @@ }, "packages/cli": { "name": "@zowe/cics-for-zowe-cli", - "version": "5.0.4", + "version": "5.0.2", "bundleDependencies": [ "@zowe/cics-for-zowe-sdk" ], "license": "EPL-2.0", "dependencies": { - "@zowe/cics-for-zowe-sdk": "5.0.4" + "@zowe/cics-for-zowe-sdk": "5.0.2" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" @@ -23053,7 +23053,7 @@ }, "packages/sdk": { "name": "@zowe/cics-for-zowe-sdk", - "version": "5.0.4", + "version": "5.0.2", "license": "EPL-2.0", "dependencies": { "xml2js": "0.5.0" @@ -23064,9 +23064,9 @@ }, "packages/vsce": { "name": "cics-extension-for-zowe", - "version": "2.3.3", + "version": "2.3.2", "dependencies": { - "@zowe/cics-for-zowe-sdk": "5.0.4", + "@zowe/cics-for-zowe-sdk": "5.0.2", "@zowe/zowe-explorer-api": "^2.14.0", "axios": "^1.6.7", "https": "~1.0.0", diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md index 9614e30e..40fcc835 100644 --- a/packages/cli/CHANGELOG.md +++ b/packages/cli/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the IBM® CICS® Plug-in for Zowe CLI will be documented in this file. -## `5.0.4` +## Recent Changes - BugFix: Updated dependencies for technical currency - BugFix: Migrated the package the CICS for Zowe Client Monorepo diff --git a/packages/cli/package.json b/packages/cli/package.json index bc967f25..da32b51a 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cics-for-zowe-cli", - "version": "5.0.4", + "version": "5.0.2", "author": "Zowe", "license": "EPL-2.0", "description": "IBM CICS Plug-in for Zowe CLI", @@ -48,7 +48,7 @@ "configurationModule": "lib/imperative.js" }, "dependencies": { - "@zowe/cics-for-zowe-sdk": "5.0.4" + "@zowe/cics-for-zowe-sdk": "5.0.2" }, "peerDependencies": { "@zowe/imperative": "^5.0.0" diff --git a/packages/sdk/CHANGELOG.md b/packages/sdk/CHANGELOG.md index 9614e30e..40fcc835 100644 --- a/packages/sdk/CHANGELOG.md +++ b/packages/sdk/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the IBM® CICS® Plug-in for Zowe CLI will be documented in this file. -## `5.0.4` +## Recent Changes - BugFix: Updated dependencies for technical currency - BugFix: Migrated the package the CICS for Zowe Client Monorepo diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 0032f63b..70a19eec 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,6 +1,6 @@ { "name": "@zowe/cics-for-zowe-sdk", - "version": "5.0.4", + "version": "5.0.2", "author": "Zowe", "license": "EPL-2.0", "description": "IBM CICS for Zowe SDK", diff --git a/packages/vsce/CHANGELOG.md b/packages/vsce/CHANGELOG.md index db72b9ba..45270b7f 100644 --- a/packages/vsce/CHANGELOG.md +++ b/packages/vsce/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the "cics-extension-for-zowe" extension will be documented in this file. -## `2.3.3` +## Recent Changes - BugFix: Updated dependencies for technical currency - BugFix: Migrated the package the CICS for Zowe Client Monorepo diff --git a/packages/vsce/package.json b/packages/vsce/package.json index 02eb8f95..145aa34f 100644 --- a/packages/vsce/package.json +++ b/packages/vsce/package.json @@ -7,7 +7,7 @@ "type": "git", "url": "https://github.com/zowe/cics-for-zowe-client.git" }, - "version": "2.3.3", + "version": "2.3.2", "engines": { "vscode": "^1.53.2" }, @@ -890,7 +890,7 @@ "vsce": "^2.15.0" }, "dependencies": { - "@zowe/cics-for-zowe-sdk": "5.0.4", + "@zowe/cics-for-zowe-sdk": "5.0.2", "@zowe/zowe-explorer-api": "^2.14.0", "axios": "^1.6.7", "https": "~1.0.0", diff --git a/scripts/bundleTgz.js b/scripts/bundleTgz.js index 2686a8e7..b5b39d7a 100644 --- a/scripts/bundleTgz.js +++ b/scripts/bundleTgz.js @@ -15,7 +15,8 @@ const fs = require("fs"); const path = require("path"); // Workaround for https://github.com/npm/cli/issues/3466 -process.chdir(__dirname + "/.."); +const rootDir = path.join(__dirname, ".."); +process.chdir(rootDir); const cliPkgDir = path.join(process.cwd(), "packages", "cli"); const pkgJsonFile = path.join(cliPkgDir, "package.json"); const execCmd = (cmd) => childProcess.execSync(cmd, { cwd: cliPkgDir, stdio: "inherit" }); @@ -49,6 +50,7 @@ try { if(fs.existsSync(path.join(cliPkgDir, "node_modules_old"))) { fsE.renameSync(path.join(cliPkgDir, "node_modules_old"), path.join(cliPkgDir, "node_modules")); } - // fs.rmSync(path.join(cliPkgDir, "npm-shrinkwrap.json"), { force: true }); + fs.rmSync(path.join(cliPkgDir, "npm-shrinkwrap.json"), { force: true }); + fs.rmSync(path.join(rootDir, "npm-shrinkwrap.json"), { force: true }); fsE.renameSync(pkgJsonFile + ".bak", pkgJsonFile); } diff --git a/scripts/rewriteShrinkwrap.js b/scripts/rewriteShrinkwrap.js index 205aa7ab..e5a4429b 100644 --- a/scripts/rewriteShrinkwrap.js +++ b/scripts/rewriteShrinkwrap.js @@ -38,7 +38,7 @@ for (const [k, v] of Object.entries(shrinkwrap.packages)) { fs.writeFileSync(cliShrinkwrapFile, JSON.stringify(shrinkwrap, null, 2)); // Build deduped shrinkwrap for @zowe/cics-for-zowe-cli -const zoweRegistry = require("../lerna.json").command.publish.registry; +const zoweRegistry = require(cliDir + "package.json").publishConfig.registry;; getLockfile(cliShrinkwrapFile, undefined, { "@zowe:registry": zoweRegistry }) .then((lockfile) => fs.writeFileSync(cliShrinkwrapFile, lockfile)) .then(() => console.log(chalk.green("Lockfile contents written!"))) @@ -73,7 +73,7 @@ try { } fs.writeFileSync(cliShrinkwrapFile, JSON.stringify(shrinkwrap, null, 2)); - // cp.execSync(`sed -i 's#file:../sdk#${require("../lerna.json").version}#g' npm-shrinkwrap.json`, {cwd: cliDir}); + // cp.execSync(`sed -i 's#file:../sdk#${require(cliDir + "package.json").version}#g' npm-shrinkwrap.json`, {cwd: cliDir}); // cp.execSync("npm i ../sdk --install-links --package-lock-only", {cwd: cliDir}); } finally { // revert back to workspaces monorepo