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.

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

[v3] Final prerelease version before v8.0.0 #2267

Merged
merged 11 commits into from
Sep 19, 2024
942 changes: 422 additions & 520 deletions npm-shrinkwrap.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"typedoc:packages": "lerna run --parallel typedoc",
"audit:public": "npm audit --registry https://registry.npmjs.org/",
"bundle:webHelp": "cd packages/imperative/web-help && node build.js",
"prepare": "husky install && npm run bundle:webHelp",
"prepare": "husky && npm run bundle:webHelp",
"package": "node scripts/bundleCliTgz.js"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@zowe/cli",
"version": "8.0.0-next.202409111528",
"zoweVersion": "v3.0.0-prerelease",
"zoweVersion": "v3.0.0",
"description": "Zowe CLI is a command line interface (CLI) that provides a simple and streamlined way to interact with IBM z/OS.",
"author": "Zowe",
"license": "EPL-2.0",
Expand Down
9 changes: 9 additions & 0 deletions packages/imperative/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

All notable changes to the Imperative package will be documented in this file.

## Recent Changes

- Update: See `5.27.1` for details

## `8.0.0-next.202408301809`

- LTS Breaking: Removed the following obsolete V1 profile classes/functions:
Expand Down Expand Up @@ -473,6 +477,11 @@ All notable changes to the Imperative package will be documented in this file.

- Major: First major version bump for V3

## `5.27.1`

- BugFix: Updated `dataobject-parser` dependency for technical currency. [#2262](https://github.com/zowe/zowe-cli/pull/2262)
- BugFix: Updated `fs-extra` and `jsonfile` dependencies for technical currency. [#2264](https://github.com/zowe/zowe-cli/pull/2264)

## `5.27.0`

- BugFix: Modified `showMsgWhenDeprecated` function to allow an empty string as a parameter when no replacement is available for the deprecated command. When no replacement is available an alternative message will be printed. [#2041](https://github.com/zowe/zowe-cli/issues/2041)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { spawn } from "cross-spawn";
import { ITestEnvironment } from "../../../../../../../__src__/environment/doc/response/ITestEnvironment";
import { SetupTestEnvironment } from "../../../../../../../__src__/environment/SetupTestEnvironment";
import { runCliScript } from "../../../../../../../src/TestUtil";
const stripAnsi = require("strip-ansi");

// Test Environment populated in the beforeAll();
let TEST_ENVIRONMENT: ITestEnvironment;
Expand All @@ -35,7 +36,7 @@ describe("imperative-test-cli config import", () => {

// Create the test environment
beforeAll(async () => {
const serverAddressRegex = /(http.*)\s/;
const serverAddressRegex = /(http:.*)\s/;

TEST_ENVIRONMENT = await SetupTestEnvironment.createTestEnv({
cliHomeEnvVar: "IMPERATIVE_TEST_CLI_CLI_HOME",
Expand All @@ -44,14 +45,14 @@ describe("imperative-test-cli config import", () => {

// Spawn a localhost HTTP file server with "npx serve" command
pServer = spawn(process.platform === "win32" ? "npx.cmd" : "npx",
["serve", __dirname + "/__resources__"]);
["http-server", __dirname + "/__resources__"]);

// Retrieve server URL from the end of first line printed to stdout
localhostUrl = await new Promise((resolve, reject) => {
pServer.stdout.on("data", (data: Buffer) => {
const match = data.toString().match(serverAddressRegex);
if(match != null) {
resolve(match[1]);
resolve(stripAnsi(match[1]));
}
});
});
Expand Down
2 changes: 1 addition & 1 deletion packages/imperative/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"cowsay": "^1.6.0",
"deep-diff": "^1.0.0",
"get-function-arguments": "^1.0.0",
"serve": "^14.2.3",
"http-server": "^14.1.1",
"stream-to-string": "^1.2.0",
"uuid": "^10.0.0",
"web-help": "file:web-help",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,7 @@ export class ConnectionPropsForSessCfg {
}

// Set default values on propsToPromptFor
if(connOpts.propsToPromptFor?.length > 0)
{
if(connOpts.propsToPromptFor?.length > 0) {
connOpts.propsToPromptFor.forEach(obj => {
if(obj.secure == null) obj.secure = true;
if(obj.secure) this.secureSessCfgProps.add(obj.name.toString());
Expand Down
16 changes: 9 additions & 7 deletions release.config.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
module.exports = {
branches: [
{
name: "master",
level: "minor"
},
// Temporarily put zowe-v2-lts branch first in the list.
// It should move down once latest becomes zowe-v3-lts.
{
name: "zowe-v?-lts",
level: "patch"
},
// Temporarily publish master branch as @next prerelease.
// When V3 goes live, remember to update alias tags below.
{
name: "next",
name: "master",
level: "none",
prerelease: true
prerelease: true,
channel: "next"
}
],
plugins: [
Expand All @@ -35,7 +36,8 @@ module.exports = {
}],
["@octorelease/lerna", {
aliasTags: {
"latest": ["zowe-v2-lts"]
"latest": ["zowe-v2-lts"],
"next": ["zowe-v3-lts"]
},
pruneShrinkwrap: ["@zowe/cli"],
smokeTest: true
Expand Down
Loading