Make requested changes

Signed-off-by: Andrew W. Harn <[email protected]>
zowe · Aug 8, 2024 · 7919322 · 7919322
1 parent ec84fc8
commit 7919322
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 49 deletions.
diff --git a/packages/imperative/.eslintrc.js b/packages/imperative/.eslintrc.js
@@ -5,8 +5,7 @@ module.exports = {
         "sourceType": "module",
         "project": [
             "./tsconfig.json",
-            "./__tests__/tsconfig.json",
-            "./tsconfig-tests.json"
+            "./__tests__/tsconfig.json"
         ]
     }
 }
diff --git a/packages/imperative/__tests__/config/jest.preset.json b/packages/imperative/__tests__/config/jest.preset.json
@@ -2,7 +2,7 @@
     "globals": {
         "ts-jest": {
             "diagnostics": false,
-            "tsconfig": "tsconfig-tests.json"
+            "tsconfig": "./__tests__/tsconfig.json"
         }
     },
     "moduleFileExtensions": ["ts","js"],

diff --git a/packages/imperative/__tests__/tsconfig.json b/packages/imperative/__tests__/tsconfig.json
@@ -19,10 +19,17 @@
     "include": [
         "**/*.test.ts",
         "**/*.subtest.ts",
-        "**/__tests__/**/*"
+        "**/__tests__/**/*",
+        "../**/*.test.ts",
+        "../**/*.subtest.ts",
+        "../**/__tests__/**/*"
     ],
     "exclude": [
         "lib",
         "node_modules"
-    ]
+    ],
+    "files": [
+        "../../__types__/wontache.d.ts"
+    ],
+    "allowJs": true
 }
diff --git a/packages/imperative/package.json b/packages/imperative/package.json
@@ -30,9 +30,9 @@
   "scripts": {
     "build:packages": "tsc --pretty",
     "build": "npm run build:packages && npm run build:webHelp",
-    "lint": "eslint \"src/**/*.ts\" \"**/__tests__/**/*.ts\"",
-    "lint:packages": "eslint \"src/**/*.ts\" --ignore-pattern \"**/__tests__/**/*.ts\"",
-    "lint:tests": "eslint \"./__tests__/**/*.ts\"",
+    "lint": "eslint \"src/**/*.ts\" \"**/__tests__/**/*.ts\" --ignore-pattern \"**/__mocks__/*.ts\"",
+    "lint:packages": "eslint \"src/**/*.ts\" --ignore-pattern \"**/__tests__/**/*.ts\" --ignore-pattern \"**/__mocks__/*.ts\"",
+    "lint:tests": "eslint \"**/__tests__/**/*.ts\"",
     "circularDependencyCheck": "madge -c lib",
     "watch": "concurrently \"tsc --pretty --watch\" \"npm run watch:webHelp\"",
     "build:webHelp": "cd web-help && npm run build",

diff --git a/packages/imperative/src/utilities/src/TextUtils.ts b/packages/imperative/src/utilities/src/TextUtils.ts
@@ -39,7 +39,7 @@ export class TextUtils {
     public static getRecommendedWidth(preferredWidth: number = TextUtils.DEFAULT_WRAP_WIDTH): number {
         const widthSafeGuard = 8; // prevent partial words from continuing over lines
         const yargs = require("yargs");
-        const maxWidth = !((yargs.terminalWidth() && yargs.terminalWidth() > 0) == null) ?
+        const maxWidth = (!(yargs.terminalWidth() == null) && yargs.terminalWidth() > 0) ?
             (yargs.terminalWidth() - widthSafeGuard) : preferredWidth;
         return Math.min(preferredWidth, maxWidth);
     }

diff --git a/packages/imperative/tsconfig-tests.json b/packages/imperative/tsconfig-tests.json