Resolved Conflicts

Signed-off-by: Likhitha Nimma <Likhitha.Nimma@ibm.com>
likhithanimma1 · Nov 17, 2023 · 808a8bb · 808a8bb
2 parents 00d3cc1 + 0903b33
commit 808a8bb
Show file tree

Hide file tree

Showing 24 changed files with 344 additions and 504 deletions.
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -18,6 +18,7 @@ jobs:
  with:
  fetch-depth: 0
 
+ # Make pnpm available for Changelog Checks
  - name: Install pnpm
  run: npm install -g pnpm
 

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -33,7 +33,7 @@ jobs:
  - name: Use Node.js LTS
  uses: actions/setup-node@v3
  with:
- node-version: '16.x'
+ node-version: lts/*
 
  - name: Install pnpm and Lerna
  run: npm install -g pnpm lerna@6

diff --git a/.github/workflows/zowe-explorer-ci.yml b/.github/workflows/zowe-explorer-ci.yml
@@ -24,7 +24,7 @@ jobs:
  # Continue to run tests on the other systems if one fails
  fail-fast: false
  matrix:
- node-version: [16.x, 18.x]
+ node-version: [18.x, 20.x]
  # order operating systems from best to worst
  os: [windows-latest, ubuntu-latest, macos-latest]
 
@@ -51,14 +51,14 @@ jobs:
 
  - name: Upload test results
  uses: actions/upload-artifact@v3
- if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
+ if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
  with:
  name: zowe-explorer-results
  path: packages/zowe-explorer/results/
 
  - name: Upload API test results
  uses: actions/upload-artifact@v3
- if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
+ if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
  with:
  name: zowe-explorer-api-results
  path: packages/zowe-explorer-api/results/
@@ -69,12 +69,12 @@ jobs:
  env_vars: OS,NODE
 
  - name: Package VSIX
- if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
+ if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
  run: pnpm package
  working-directory: packages/zowe-explorer
 
  - name: Archive VSIX artifact
- if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
+ if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
  uses: actions/upload-artifact@v3
  with:
  name: zowe-explorer-vsix

diff --git a/.github/workflows/zowe-explorer-ftp-ci.yml b/.github/workflows/zowe-explorer-ftp-ci.yml
@@ -24,7 +24,7 @@ jobs:
  # Continue to run tests on the other systems if one fails
  fail-fast: false
  matrix:
- node-version: [16.x, 18.x]
+ node-version: [18.x, 20.x]
  # order operating systems from best to worst
  os: [windows-latest, ubuntu-latest, macos-latest]
 
@@ -51,25 +51,25 @@ jobs:
 
  - name: Upload test results
  uses: actions/upload-artifact@v3
- if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
+ if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
  with:
  name: zowe-explorer-ftp-extension-results
  path: packages/zowe-explorer-ftp-extension/results/
 
  # Run codecov upload for only one run
  # - name: Upload Results to Codecov
- # if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
+ # if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
  # uses: codecov/codecov-action@v3
  # with:
  # env_vars: OS,NODE
 
  - name: Package VSIX
- if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
+ if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
  run: pnpm package
  working-directory: packages/zowe-explorer-ftp-extension
 
  - name: Archive VSIX artifact
- if: matrix.os == 'ubuntu-latest' && matrix.node-version == '16.x'
+ if: matrix.os == 'ubuntu-latest' && matrix.node-version == '20.x'
  uses: actions/upload-artifact@v3
  with:
  name: zowe-explorer-ftp-extension-vsix

diff --git a/.github/workflows/zowe-explorer-samples.yml b/.github/workflows/zowe-explorer-samples.yml
@@ -25,7 +25,7 @@ jobs:
  # Continue to run tests on the other systems if one fails
  fail-fast: false
  matrix:
- node-version: [16.x, 18.x]
+ node-version: [18.x, 20.x]
 
  if: (github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository) && !contains(github.event.head_commit.message, '[ci skip]')
 

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
- "version": "3.0.0-next.202309141150",
+ "version": "3.0.0-next.202311171754",
  "command": {
  "version": {
  "forcePublish": true,

diff --git a/package.json b/package.json
@@ -17,13 +17,13 @@
  },
  "dependencies": {
  "@zowe/cli": "7.18.0",
- "vscode-nls": "4.1.2"
+ "vscode-nls": "5.2.0"
  },
  "devDependencies": {
  "@types/jest": "^29.2.3",
  "@types/mocha": "^10.0.1",
  "@types/node": "^14.18.12",
- "@types/vscode": "^1.53.2",
+ "@types/vscode": "^1.73.0",
  "@typescript-eslint/eslint-plugin": "^5.53.0",
  "@typescript-eslint/parser": "^5.53.0",
  "eslint": "^8.34.0",
@@ -39,19 +39,22 @@
  "mocha": "^10.2.0",
  "mocha-junit-reporter": "^2.2.0",
  "mocha-multi-reporters": "^1.5.1",
+ "ovsx": "^0.8.3",
  "prettier": "2.6.0",
  "rimraf": "^3.0.2",
  "ts-jest": "^29.0.3",
  "ts-loader": "^8.2.0",
  "typescript": "^4.5.3",
- "vsce": "2.15.0",
+ "@vscode/vsce": "2.15.0",
  "vscode-nls-dev": "^4.0.0",
- "vscode-test": "^1.4.0"
+ "@vscode/test-electron": "^1.6.0"
  },
- "overrides": {
- "**/json5": "^2.2.2",
- "**/optionator": "^0.9.3",
- "**/semver": "^7.5.2"
+ "pnpm": {
+ "overrides": {
+ "json5": "^2.2.2",
+ "optionator": "^0.9.3",
+ "semver": "^7.5.2"
+ }
  },
  "scripts": {
  "clean": "pnpm -r run clean",

diff --git a/packages/eslint-plugin-zowe-explorer/CHANGELOG.md b/packages/eslint-plugin-zowe-explorer/CHANGELOG.md
@@ -1,5 +1,7 @@
 All notable changes to the "eslint-plugin-zowe-explorer" package will be documented in this file.
 
+## `3.0.0-next.202311171754`
+
 ## `3.0.0-next.202309121526`
 
 ### New features and enhancements

diff --git a/packages/eslint-plugin-zowe-explorer/package.json b/packages/eslint-plugin-zowe-explorer/package.json
@@ -1,6 +1,6 @@
 {
  "name": "eslint-plugin-zowe-explorer",
- "version": "3.0.0-next.202309141150",
+ "version": "3.0.0-next.202311171754",
  "description": "Custom ESLint Rules for ZOWE Explorer",
  "keywords": [
  "eslint",

diff --git a/packages/zowe-explorer-api/CHANGELOG.md b/packages/zowe-explorer-api/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to the "zowe-explorer-api" extension will be documented in this file.
 
+## `3.0.0-next.202311171754`
+
+## Bug fixes
+
+- fixed export of api `onProfilesUpdate`.
+
 ## `3.0.0-next.202309121526`
 
 ### New features and enhancements

diff --git a/packages/zowe-explorer-api/package.json b/packages/zowe-explorer-api/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@zowe/zowe-explorer-api",
- "version": "3.0.0-next.202309141150",
+ "version": "3.0.0-next.202311171754",
  "description": "Extensibility API for Zowe Explorer.",
  "publisher": "Zowe",
  "author": "Zowe",

diff --git a/packages/zowe-explorer-api/src/extend/IRegisterClient.ts b/packages/zowe-explorer-api/src/extend/IRegisterClient.ts
@@ -11,6 +11,8 @@
 
 import { imperative } from "@zowe/cli";
 import { ICommand, IJes, IMvs, IUss } from "./interfaces";
+import * as vscode from "vscode";
+import { EventTypes } from "../profiles";
 
 /**
  * This interface can be used by other VS Code Extensions to register themselves
@@ -102,4 +104,9 @@ export interface IRegisterClient {
  * @returns {string[]}
  */
  registeredApiTypes(): string[];
+
+ /**
+ * Define events that fire whenever an existing team config profile is updated.
+ */
+ onProfilesUpdate?: vscode.Event<EventTypes>;
 }
diff --git a/packages/zowe-explorer-ftp-extension/CHANGELOG.md b/packages/zowe-explorer-ftp-extension/CHANGELOG.md
@@ -1,13 +1,13 @@
 All notable changes to the "zowe-explorer-ftp-extension" extension will be documented in this file.
 
-## TBD Release
+## `3.0.0-next.202311171754`
+
+## `3.0.0-next.202311171523`
 
 ### New features and enhancements
 
 - Support VS Code engine 1.79.0 and higher.
 
-### Bug fixes
-
 ## `3.0.0-next.202309121526`
 
 ### New features and enhancements

diff --git a/packages/zowe-explorer-ftp-extension/package.json b/packages/zowe-explorer-ftp-extension/package.json
@@ -5,7 +5,7 @@
  "author": "Zowe",
  "license": "EPL-2.0",
  "description": "Adds zFTP support to Zowe Explorer demonstrating how to extend the Zowe Explorer using its extensibility API.",
- "version": "3.0.0-next.202309141150",
+ "version": "3.0.0-next.202311171754",
  "icon": "resources/zowe-ftp-color.png",
  "repository": {
  "url": "https://github.com/zowe/vscode-extension-for-zowe"
@@ -49,7 +49,7 @@
  },
  "dependencies": {
  "@zowe/zos-ftp-for-zowe-cli": "2.1.2",
- "@zowe/zowe-explorer-api": "3.0.0-next.202309141150",
+ "@zowe/zowe-explorer-api": "3.0.0-next.202311171754",
  "tmp": "0.2.1"
  },
  "devDependencies": {

diff --git a/packages/zowe-explorer/CHANGELOG.md b/packages/zowe-explorer/CHANGELOG.md
@@ -2,15 +2,17 @@
 
 All notable changes to the "vscode-extension-for-zowe" extension will be documented in this file.
 
-## TBD Release
+## `3.0.0-next.202311171754`
+
+## `3.0.0-next.202311171523`
 
 ### New features and enhancements
 
+- Migrate from Yarn to PNPM.
+- Update dependencies for technical currency purposes
 - Support VS Code engine 1.79.0 and higher.
 - Ability to compare 2 files from MVS and/or UNIX System Services views via right click actions, with option to compare in Read-Only mode too.
 
-### Bug fixes
-
 ## `3.0.0-next.202309121526`
 
 ### New features and enhancements