Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update workflows and deps for technical currency #187

Merged
merged 3 commits into from
Jan 3, 2025
Merged

Update workflows and deps for technical currency #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73b27c7
Update workflows and deps for technical currency
t1m0thyj Dec 24, 2024
966af6b
Remove prepack and postpack scripts
t1m0thyj Jan 2, 2025
fccb2b7
Update CLI changelog
t1m0thyj Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
7 changes: 4 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions packages/cli/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
12 changes: 2 additions & 10 deletions scripts/bundleTgz.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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"));
}
Expand Down Expand Up @@ -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;
}
Loading