Fix merge conflict resolution

Signed-off-by: Timothy Johnson <timothy.johnson@broadcom.com>

Author: t1m0thyj

packages/eslint-plugin-zowe-explorer/lib/rules/no-floating-promises.js

@@ -7,7 +7,7 @@ const path = require("path");
 const rewire = require("rewire");
 const tsutils = require("tsutils");
 const eslintPluginPath = path.dirname(require.resolve("@typescript-eslint/eslint-plugin"));
-const oldRule = rewire( eslintPluginPath + "/rules/no-floating-promises");
+const oldRule = rewire(eslintPluginPath + "/rules/no-floating-promises");
 const oldIsPromiseLike = oldRule.__get__("isPromiseLike");
 oldRule.__set__("isPromiseLike", (checker, node) => {
     const type = checker.getTypeAtLocation(node);

packages/zowe-explorer/__tests__/__unit__/trees/shared/SharedInit.unit.test.ts

@@ -14,7 +14,7 @@ import * as vscode from "vscode";
 import * as core from "@zowe/core-for-zowe-sdk";
 import * as profUtils from "../../../../src/utils/ProfilesUtils";
 import * as SharedHistoryView from "../../../../src/trees/shared/SharedHistoryView";
-import { IviIt, ITestContext, processSubscriptions } from "../../../__common__/testUtils";
+import { IJestIt, ITestContext, processSubscriptions } from "../../../__common__/testUtils";
 import { Constants } from "../../../../src/configuration/Constants";
 import { Profiles } from "../../../../src/configuration/Profiles";
 import { SharedActions } from "../../../../src/trees/shared/SharedActions";
@@ -80,7 +80,7 @@ describe("Test src/shared/extension", () => {
         const onProfileUpdated = vi.fn().mockReturnValue(new vscode.Disposable(vi.fn()));
         const mockOnProfileUpdated = new MockedProperty(ZoweExplorerApiRegister.getInstance(), "onProfileUpdated", undefined, onProfileUpdated);
 
-        const commands: IviIt[] = [
+        const commands: IJestIt[] = [
             {
                 name: "zowe.updateSecureCredentials",
                 parm: ["@zowe/cli"],

packages/zowex-for-zowe-explorer/package.json

@@ -23,8 +23,6 @@
     "clean": "rimraf bin lib coverage",
     "license": "node ../../scripts/updateLicenses.mjs",
     "link:zowex": "node ../../scripts/linkZowex.js",
-    "newlint": "concurrently -n \"_eslint_,prettier\" \"pnpm lint:all\" \"pnpm lint:pretty\"",
-    "newlint:html": "(mkdir -p \"results\" || true) && eslint . --format html > results/eslint.html",
     "lint": "concurrently -n \"_eslint_,prettier\" \"pnpm lint:src\" \"pnpm lint:html\" \"pnpm lint:pretty\"",
     "lint:all": "pnpm run \"/^lint:[hst].*/\"",
     "lint:html": "(mkdir -p \"results\" || true) && eslint ./src --format html > results/eslint.html",
@@ -33,9 +31,6 @@
     "lint:test": "eslint --format stylish \"tests/**/*.ts\"",
     "madge": "madge -c --no-color --no-spinner --exclude __mocks__ --extensions js,ts src/",
     "package": "echo 'zowex: nothing to package.'",
-    "oldtest": "vitest run --coverage",
-    "oldtest:ui": "vitest --ui --coverage",
-    "oldtest:watch": "vitest --watch",
     "test": "vitest run --coverage",
     "watch": "tsc --watch -p ./"
   },