Merge pull request #2529 from zowe/next-deploy

fix(cd): Workflow and Dependency Updates

.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
 

.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

.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

.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

.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]')
 

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",

packages/zowe-explorer/CHANGELOG.md

@@ -6,6 +6,11 @@ All notable changes to the "vscode-extension-for-zowe" extension will be documen
 
 ### New features and enhancements
 
+- Migrate from Yarn to PNPM.
+
+### Bug fixes
+
+- 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.
 

packages/zowe-explorer/__tests__/__integration__/extension.integration.test.ts

@@ -826,7 +826,7 @@ describe("Extension Integration Tests", async () => {
             await vscode.workspace
                 .getConfiguration()
                 .update(globals.SETTINGS_DS_HISTORY, { persistence: true, favorites: [] }, vscode.ConfigurationTarget.Global);
-            const testTree3 = await createDatasetTree(log);
+            const testTree3 = await createDatasetTree();
             expect(testTree3.mFavorites).to.deep.equal([]);
         }).timeout(TIMEOUT);
 
@@ -842,7 +842,7 @@ describe("Extension Integration Tests", async () => {
             await vscode.workspace
                 .getConfiguration()
                 .update(globals.SETTINGS_DS_HISTORY, { persistence: true, favorites }, vscode.ConfigurationTarget.Global);
-            const testTree3 = await createDatasetTree(log);
+            const testTree3 = await createDatasetTree();
             const initializedFavLabels = [`${pattern}.EXT.PDS`, `${pattern}.EXT.PS`, `${pattern}.EXT.SAMPLE.PDS`, `${pattern}.EXT`];
             expect(testTree3.mFavorites[0].children.map((node) => node.label)).to.deep.equal(initializedFavLabels);
         }).timeout(TIMEOUT);
@@ -855,7 +855,7 @@ describe("Extension Integration Tests", async () => {
                 .getConfiguration()
                 .update(globals.SETTINGS_DS_HISTORY, { persistence: true, favorites }, vscode.ConfigurationTarget.Global);
             const logWarnStub = sandbox.spy(log, "warn");
-            await createDatasetTree(log);
+            await createDatasetTree();
             expect(logWarnStub.gotCalledOnce);
         }).timeout(TIMEOUT);
 
@@ -875,7 +875,7 @@ describe("Extension Integration Tests", async () => {
             await vscode.workspace
                 .getConfiguration()
                 .update(globals.SETTINGS_DS_HISTORY, { persistence: true, favorites }, vscode.ConfigurationTarget.Global);
-            await testTree.initializeFavorites(log);
+            await testTree.initializeFavorites();
             const initializedFavProfileLabels = [`${profileName}`, "badProfileName"];
             const goodProfileFavLabels = [`${pattern}.EXT.PDS`, `${pattern}.EXT.PS`, `${pattern}.EXT.SAMPLE.PDS`, `${pattern}.EXT`];
             const badProfileFavLabels = [`${pattern}.BAD.PROFILE.EXT.PS`];

packages/zowe-explorer/__tests__/__integration__/runTest.ts

@@ -11,7 +11,7 @@
 
 import * as path from "path";
 
-import { runTests } from "vscode-test";
+import { runTests } from "@vscode/test-electron";
 
 async function main() {
     try {