Merge branch 'master' into chore/update-dev-scripts

Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>
zowe · Aug 9, 2024 · 3c28719 · 3c28719
2 parents 8b9a08e + 0eb0933
commit 3c28719
Show file tree

Hide file tree

Showing 159 changed files with 1,215 additions and 533 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -5,7 +5,8 @@ module.exports = {
     },
     "extends": [
         "eslint:recommended",
-        "plugin:@typescript-eslint/recommended"
+        "plugin:@typescript-eslint/recommended",
+        "plugin:deprecation/recommended"
     ],
     "ignorePatterns": [
         "**/*.js",
@@ -37,7 +38,8 @@ module.exports = {
     "parser": "@typescript-eslint/parser",
     "parserOptions": {
         "ecmaVersion": 12,
-        "sourceType": "module"
+        "sourceType": "module",
+        "project": ["./tsconfig.json", "./__tests__/tsconfig.json"]
     },
     "plugins": [
         "@typescript-eslint",

diff --git a/.madgerc b/.madgerc
@@ -0,0 +1,7 @@
+{
+    "detectiveOptions": {
+        "ts": {
+            "skipTypeImports": true
+        }
+    }
+}
diff --git a/__tests__/__packages__/cli-test-utils/CHANGELOG.md b/__tests__/__packages__/cli-test-utils/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the Zowe CLI test utils package will be documented in this file.
 
+## `7.28.3`
+
+- BugFix: Refactored code to reduce the use of deprecated functions to prepare for upcoming Node.js 22 support. [#2191](https://github.com/zowe/zowe-cli/issues/2191)
+
 ## `7.28.2`
 
 - BugFix: Improved the error message shown on Windows when `runCliScript` method cannot find `sh` executable on PATH. [#2208](https://github.com/zowe/zowe-cli/issues/2208)

diff --git a/__tests__/__packages__/cli-test-utils/package.json b/__tests__/__packages__/cli-test-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zowe/cli-test-utils",
-  "version": "7.28.2",
+  "version": "7.28.3",
   "description": "Test utilities package for Zowe CLI plug-ins",
   "author": "Zowe",
   "license": "EPL-2.0",
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.0",
     "@types/uuid": "^8.3.0",
-    "@zowe/imperative": "5.26.1"
+    "@zowe/imperative": "5.26.2"
   },
   "peerDependencies": {
     "@zowe/imperative": "^5.0.0"

diff --git a/__tests__/__packages__/cli-test-utils/src/TestUtils.ts b/__tests__/__packages__/cli-test-utils/src/TestUtils.ts
@@ -155,6 +155,7 @@ export function mockHandlerParameters(params: PartialHandlerParameters): IHandle
             ...(params.arguments || {})
         },
         positionals: params.positionals || [],
+        // eslint-disable-next-line deprecation/deprecation
         profiles: params.profiles || new CommandProfiles(new Map()),
         definition: params.definition,
         fullDefinition: params.definition,

diff --git a/__tests__/__packages__/cli-test-utils/src/environment/TempTestProfiles.ts b/__tests__/__packages__/cli-test-utils/src/environment/TempTestProfiles.ts
@@ -216,6 +216,7 @@ export class TempTestProfiles {
         config.api.layers.activate(false, true);
 
         // Remove profile from config JSON
+        // eslint-disable-next-line deprecation/deprecation
         config.delete(config.api.profiles.expandPath(profileName));
         if (config.api.layers.get().properties.defaults[profileType] === profileName) {
             config.delete(`defaults.${profileType}`);

diff --git a/__tests__/test-tsconfig.json → __tests__/tsconfig.json b/__tests__/test-tsconfig.json → __tests__/tsconfig.json
@@ -17,8 +17,9 @@
     "newLine": "lf"
   },
   "include": [
-    "./**/*.ts",
-    "../packages/**/__tests__/**/*.ts"
+    "**/*.test.ts",
+    "**/*.subtest.ts",
+    "**/__tests__/**/*"
   ],
   "files": [
     "../__types__/wontache.d.ts"

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "7.28.2",
+  "version": "7.28.3",
   "command": {
     "publish": {
       "ignoreChanges": [