@catladder/cli 1.40.4 → 1.41.0

package/dist/utils/gitlab.d.ts

@@ -1,5 +1,5 @@
 import memoizee from "memoizee";
-import { CommandInstance } from "vorpal";
+import type { CommandInstance } from "vorpal";
 export declare const hasGitlabToken: () => Promise<boolean>;
 export declare const setupGitlabToken: (vorpal: CommandInstance) => Promise<void>;
 export declare const getGitlabToken: (vorpal: CommandInstance) => Promise<string>;

package/dist/utils/projects/index.d.ts

@@ -3,6 +3,3 @@ export declare const getRootGitlabCiFile: () => Promise<string>;
 export declare const readRootGitlabCiFile: () => Promise<any[]>;
 export declare const hasGitlabCiFile: () => Promise<boolean>;
 export declare const getProjectNamespace: (envComponent: string) => Promise<string>;
-export declare const getProjectPods: (envComponent: string) => Promise<import("@kubernetes/client-node").V1Pod[]>;
-export declare const getProjectPvcs: (envComponent: string) => Promise<import("@kubernetes/client-node").V1PersistentVolumeClaim[]>;
-export declare const getProjectPodNames: (envComponent: string) => Promise<string[]>;

package/dist/utils/projects/index.js

@@ -36,10 +36,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 exports.__esModule = true;
-exports.getProjectPodNames = exports.getProjectPvcs = exports.getProjectPods = exports.getProjectNamespace = exports.hasGitlabCiFile = exports.readRootGitlabCiFile = exports.getRootGitlabCiFile = exports.getGitRoot = void 0;
+exports.getProjectNamespace = exports.hasGitlabCiFile = exports.readRootGitlabCiFile = exports.getRootGitlabCiFile = exports.getGitRoot = void 0;
 var path_1 = require("path");
 var getProjectConfig_1 = require("../../config/getProjectConfig");
-var k8sApi_1 = require("../../k8sApi");
 var files_1 = require("../files");
 var child_process_promise_1 = require("child-process-promise");
 var getGitRoot = function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -101,49 +100,4 @@ var getProjectNamespace = function (envComponent) { return __awaiter(void 0, voi
     });
 }); };
 exports.getProjectNamespace = getProjectNamespace;
-var getProjectPods = function (envComponent) { return __awaiter(void 0, void 0, void 0, function () {
-    var namespace, k8sApi, res, componentName;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports.getProjectNamespace)(envComponent)];
-            case 1:
-                namespace = _a.sent();
-                k8sApi = (0, k8sApi_1.getk8sApi)();
-                return [4 /*yield*/, k8sApi.listNamespacedPod(namespace)];
-            case 2:
-                res = _a.sent();
-                componentName = (0, getProjectConfig_1.parseChoice)(envComponent).componentName;
-                return [2 /*return*/, res.body.items.filter(function (item) { var _a, _b; return componentName ? (_b = (_a = item.metadata) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.includes(componentName + "-") : true; })];
-        }
-    });
-}); };
-exports.getProjectPods = getProjectPods;
-var getProjectPvcs = function (envComponent) { return __awaiter(void 0, void 0, void 0, function () {
-    var namespace, k8sApi, res;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports.getProjectNamespace)(envComponent)];
-            case 1:
-                namespace = _a.sent();
-                k8sApi = (0, k8sApi_1.getk8sApi)();
-                return [4 /*yield*/, k8sApi.listNamespacedPersistentVolumeClaim(namespace)];
-            case 2:
-                res = _a.sent();
-                return [2 /*return*/, res.body.items];
-        }
-    });
-}); };
-exports.getProjectPvcs = getProjectPvcs;
-var getProjectPodNames = function (envComponent) { return __awaiter(void 0, void 0, void 0, function () {
-    var pods;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, (0, exports.getProjectPods)(envComponent)];
-            case 1:
-                pods = _a.sent();
-                return [2 /*return*/, pods.map(function (n) { return n.metadata.name; })];
-        }
-    });
-}); };
-exports.getProjectPodNames = getProjectPodNames;
 //# sourceMappingURL=index.js.map

package/dist/utils/projects/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/projects/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/utils/projects/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4B;AAC5B,kEAA8E;AAE9E,kCAA2C;AAC3C,+DAA6C;AAEtC,IAAM,UAAU,GAAG;;;oBAChB,qBAAM,IAAA,4BAAI,EAAC,+BAA+B,CAAC,EAAA;oBAAnD,sBAAO,CAAC,SAA2C,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAC;;;KACpE,CAAC;AAFW,QAAA,UAAU,cAErB;AAEK,IAAM,mBAAmB,GAAG;;;;oBACjB,qBAAM,IAAA,kBAAU,GAAE,EAAA;;gBAA5B,OAAO,GAAG,SAAkB;gBAClC,sBAAO,IAAA,WAAI,EAAC,OAAO,EAAE,gBAAgB,CAAC,EAAC;;;KACxC,CAAC;AAHW,QAAA,mBAAmB,uBAG9B;AAEK,IAAM,oBAAoB,GAAG;;;YAClC,KAAA,uBAAe,CAAA;YAAC,qBAAM,IAAA,2BAAmB,GAAE,EAAA;gBAA3C,sBAAA,kBAAgB,SAA2B,EAAC,EAAA;;SAAA,CAAC;AADlC,QAAA,oBAAoB,wBACc;AAExC,IAAM,eAAe,GAAG;;;;oBACP,qBAAM,IAAA,4BAAoB,GAAE,EAAA;;gBAA5C,KAAgB,SAA4B,EAA3C,KAAK,QAAA,EAAE,IAAI,QAAA;gBAClB,IAAI,KAAK,EAAE;oBACT,sBAAO,KAAK,EAAC;iBACd;gBACD,sBAAO,IAAI,EAAC;;;KACb,CAAC;AANW,QAAA,eAAe,mBAM1B;AAEK,IAAM,mBAAmB,GAAG,UAAO,YAAoB;;;;;gBACpD,GAAG,GAAK,IAAA,8BAAW,EAAC,YAAY,CAAC,IAA9B,CAA+B;gBAC3B,qBAAM,IAAA,mCAAgB,GAAE,EAAA;;gBAAjC,MAAM,GAAG,SAAwB;gBACvC,sBAAO,UAAG,MAAM,CAAC,YAAY,cAAI,MAAM,CAAC,OAAO,cAAI,GAAG,CAAE,EAAC;;;KAC1D,CAAC;AAJW,QAAA,mBAAmB,uBAI9B"}

package/package.json

@@ -8,7 +8,9 @@
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",
     "test": "yarn run lint",
-    "build": "yarn tsc",
+    "build": "yarn build:compile && yarn build:bundle",
+    "build:bundle": "./scripts/bundle",
+    "build:compile": "yarn tsc",
     "build:watch": "yarn tsc -w"
   },
   "bin": {
@@ -16,34 +18,19 @@
     "catladder": "./bin/catladder"
   },
   "dependencies": {
-    "@catladder/pipeline": "1.40.4",
-    "@kubernetes/client-node": "^0.16.2",
-    "child-process-promise": "^2.2.1",
-    "clipboardy": "^2.0.0",
-    "command-exists-promise": "^2.0.2",
-    "common-tags": "^1.8.0",
-    "dayjs": "^1.10.4",
-    "fs-extra": "^7.0.1",
-    "gitlab": "^4.4.1",
-    "js-yaml": "^4.1.0",
-    "lodash": "^4.17.21",
-    "memoizee": "^0.4.14",
-    "node-fetch": "^2.3.0",
-    "open": "^8.4.0",
-    "prettier": "^2.5.1",
-    "tmp-promise": "^2.0.2",
-    "update-notifier": "^2.5.0",
-    "vorpal": "^1.12.0"
+    "ts-node": "^10.9.1"
   },
   "engines": {
     "node": ">=12.0.0"
   },
   "devDependencies": {
+    "@catladder/pipeline": "1.41.0",
+    "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.0",
     "@types/fs-extra": "^5.0.4",
     "@types/js-yaml": "^4.0.5",
-    "@types/lodash": "^4.14.119",
+    "@types/lodash": "^4.14.185",
     "@types/memoizee": "^0.4.2",
     "@types/node-fetch": "^2.1.4",
     "@types/request": "^2.48.1",
@@ -52,8 +39,24 @@
     "@types/vorpal": "^1.12.0",
     "@types/websocket": "^0.0.40",
     "@types/yargs": "^13.0.0",
+    "child-process-promise": "^2.2.1",
+    "clipboardy": "^2.0.0",
+    "command-exists-promise": "^2.0.2",
+    "common-tags": "^1.8.0",
+    "dayjs": "^1.10.4",
     "eslint": "^8.7.0",
-    "typescript": "^4.5.4"
+    "fs-extra": "^7.0.1",
+    "gitlab": "^4.4.1",
+    "js-yaml": "^4.1.0",
+    "lodash": "^4.17.21",
+    "memoizee": "^0.4.14",
+    "node-fetch": "^2.3.0",
+    "open": "^8.4.0",
+    "prettier": "^2.5.1",
+    "tmp-promise": "^2.0.2",
+    "typescript": "^4.5.4",
+    "update-notifier": "^6.0.2",
+    "vorpal": "^1.12.0"
   },
-  "version": "1.40.4"
+  "version": "1.41.0"
 }

package/scripts/bundle

@@ -0,0 +1,4 @@
+#!/bin/bash
+ncc build dist/catenv.js -o dist/bundles/catenv -e 'ts-node' -m
+
+ncc build dist/cli.js -o dist/bundles/cli -e 'ts-node' -m

package/src/apps/catenv/catenv.ts

@@ -1,4 +1,4 @@
-import { Config, ComponentConfig } from "@catladder/pipeline";
+import type { Config, ComponentConfig } from "@catladder/pipeline";
 import { getEnvVars, getProjectConfig } from "../../config/getProjectConfig";
 import { getGitRoot } from "../../utils/projects";
 import { join } from "path";

package/src/apps/cli/commands/general/index.ts

@@ -1,5 +1,5 @@
 import memoizee from "memoizee";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { getk8sApi } from "../../../../k8sApi";
 import { getCurrentContext } from "../../../../utils/cluster";
 import { logError } from "../../../../utils/log";

package/src/apps/cli/commands/general/portForward.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { logError } from "../../../../utils/log";
 
 import { startPortForward } from "../../../../utils/portForward";

package/src/apps/cli/commands/mongodb/index.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import projectMongoDestroyMember from "./projectMongoDestroyMember";
 import projectMongoGetShell from "./projectMongoGetShell";
 import projectMongoPortForward from "./projectMongoPortForward";

package/src/apps/cli/commands/mongodb/projectMongoDestroyMember.ts

@@ -1,10 +1,8 @@
 import { exec } from "child-process-promise";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
+import { getProjectPvcs } from "../../../../kubernetes";
 import { logError } from "../../../../utils/log";
-import {
-  getProjectNamespace,
-  getProjectPvcs,
-} from "../../../../utils/projects";
+import { getProjectNamespace } from "../../../../utils/projects";
 import { envAndComponents } from "../project/utils/autocompletions";
 import ensureCluster from "../project/utils/ensureCluster";
 import { getMongoDbPodsWithReplInfo } from "./utils";

package/src/apps/cli/commands/mongodb/projectMongoGetShell.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { logError } from "../../../../utils/log";
 import { getProjectNamespace } from "../../../../utils/projects";
 import { envAndComponents } from "../project/utils/autocompletions";

package/src/apps/cli/commands/mongodb/projectMongoPortForward.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { getEnvVars, parseChoice } from "../../../../config/getProjectConfig";
 import { logError } from "../../../../utils/log";
 import { startPortForward } from "../../../../utils/portForward";

package/src/apps/cli/commands/mongodb/utils/index.ts

@@ -1,8 +1,6 @@
 import { exec, spawn } from "child-process-promise";
-import {
-  getProjectNamespace,
-  getProjectPodNames,
-} from "../../../../../utils/projects";
+import { getProjectPodNames } from "../../../../../kubernetes";
+import { getProjectNamespace } from "../../../../../utils/projects";
 
 const filterMongoDbs = (podNames: string[]) =>
   podNames.filter(

package/src/apps/cli/commands/project/commandCloudSqlProxy.ts

@@ -2,7 +2,7 @@ import { isOfDeployType } from "@catladder/pipeline";
 import { spawn } from "child-process-promise";
 import { writeFile } from "fs-extra";
 import { withFile } from "tmp-promise";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   getEnvVars,
   getGitlabVar,

package/src/apps/cli/commands/project/commandConfigSecrets.ts

@@ -2,7 +2,8 @@
 import { getSecretVarName } from "@catladder/pipeline";
 import { stripIndents } from "common-tags";
 import { difference } from "lodash";
-import Vorpal, { CommandInstance } from "vorpal";
+import type { CommandInstance } from "vorpal";
+import type Vorpal from "vorpal";
 import {
   getAllComponentsWithAllEnvsHierarchical,
   getEnvironment,

package/src/apps/cli/commands/project/commandCopyDB.ts

@@ -1,5 +1,5 @@
 import { spawn } from "child-process-promise";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   getEnvVars,
   getProjectConfig,

package/src/apps/cli/commands/project/commandDeletePods.ts

@@ -1,11 +1,9 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { getk8sApi } from "../../../../k8sApi";
+import { getProjectPodNames } from "../../../../kubernetes";
 
 import { logError } from "../../../../utils/log";
-import {
-  getProjectNamespace,
-  getProjectPodNames,
-} from "../../../../utils/projects";
+import { getProjectNamespace } from "../../../../utils/projects";
 import { envAndComponents } from "./utils/autocompletions";
 import ensureCluster from "./utils/ensureCluster";
 

package/src/apps/cli/commands/project/commandDeleteProject.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { exec } from "child-process-promise";
 import { getProjectNamespace } from "../../../../utils/projects";
 import { envAndComponents } from "./utils/autocompletions";

package/src/apps/cli/commands/project/commandEnvVars.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { getEnvVars, parseChoice } from "../../../../config/getProjectConfig";
 import { envAndComponents } from "./utils/autocompletions";
 

package/src/apps/cli/commands/project/commandGetMyTotalWorktime.ts

@@ -1,5 +1,5 @@
 import { spawn } from "child-process-promise";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 
 export default async (vorpal: Vorpal) =>
   vorpal

package/src/apps/cli/commands/project/commandGetShell.ts

@@ -1,9 +1,7 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
+import { getProjectPodNames } from "../../../../kubernetes";
 import { logError } from "../../../../utils/log";
-import {
-  getProjectNamespace,
-  getProjectPodNames,
-} from "../../../../utils/projects";
+import { getProjectNamespace } from "../../../../utils/projects";
 import { getShell } from "../../../../utils/shell";
 
 import { envAndComponents } from "./utils/autocompletions";

package/src/apps/cli/commands/project/commandGitlabCi.ts

@@ -1,7 +1,8 @@
 import { exec } from "child-process-promise";
 import { last } from "lodash";
 import open from "open";
-import Vorpal, { CommandInstance } from "vorpal";
+import type { CommandInstance } from "vorpal";
+import type Vorpal from "vorpal";
 import {
   doGitlabRequest,
   getGitlabToken,

package/src/apps/cli/commands/project/commandInitProject.old.ts

@@ -2,7 +2,7 @@ import { readFile, writeFile } from "fs-extra";
 import { dump } from "js-yaml";
 import { mapKeys, snakeCase, toUpper } from "lodash";
 import path from "path";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { hasGitlabCiFile } from "../../../../utils/projects";
 
 const transformVar = (key: string) => toUpper(snakeCase(key));

package/src/apps/cli/commands/project/commandListPods.ts

@@ -1,7 +1,7 @@
 import { dump } from "js-yaml";
 import { pick } from "lodash";
-import Vorpal from "vorpal";
-import { getProjectPods } from "../../../../utils/projects";
+import type Vorpal from "vorpal";
+import { getProjectPods } from "../../../../kubernetes";
 import { envAndComponents } from "./utils/autocompletions";
 import ensureCluster from "./utils/ensureCluster";
 

package/src/apps/cli/commands/project/commandMigrateHelm3.ts

@@ -1,5 +1,5 @@
 import { exec } from "child-process-promise";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   getEnvironment,
   parseChoice,

package/src/apps/cli/commands/project/commandNamespace.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { getProjectNamespace } from "../../../../utils/projects";
 import { envAndComponents } from "./utils/autocompletions";
 

package/src/apps/cli/commands/project/commandOpenCostDashboard.ts

@@ -1,5 +1,5 @@
 import open from "open";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   GRAFANA_PROXY_LOCAL_PORT,
   GRAFANA_PROXY_TARGET_PORT,

package/src/apps/cli/commands/project/commandOpenDashboard.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   getPipelineContextByChoice,
   parseChoice,

package/src/apps/cli/commands/project/commandOpenEnv.ts

@@ -1,5 +1,5 @@
 import open from "open";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   getEnvironment,
   parseChoice,

package/src/apps/cli/commands/project/commandOpenGit.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { exec } from "child-process-promise";
 
 export default async (vorpal: Vorpal) =>

package/src/apps/cli/commands/project/commandOpenGrafana.ts

@@ -1,6 +1,6 @@
 import open from "open";
 import { startPortForward } from "../../../../utils/portForward";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   GRAFANA_PROXY_LOCAL_PORT,
   GRAFANA_PROXY_TARGET_PORT,

package/src/apps/cli/commands/project/commandOpenGrafanaPod.ts

@@ -1,15 +1,13 @@
 import open from "open";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   GRAFANA_PROXY_LOCAL_PORT,
   GRAFANA_PROXY_TARGET_PORT,
 } from "../../../../config/constants";
+import { getProjectPodNames } from "../../../../kubernetes";
 import { logError } from "../../../../utils/log";
 import { startPortForward } from "../../../../utils/portForward";
-import {
-  getProjectNamespace,
-  getProjectPodNames,
-} from "../../../../utils/projects";
+import { getProjectNamespace } from "../../../../utils/projects";
 import { envAndComponents } from "./utils/autocompletions";
 import ensureCluster from "./utils/ensureCluster";
 

package/src/apps/cli/commands/project/commandOpenLogs.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   getPipelineContextByChoice,
   parseChoice,

package/src/apps/cli/commands/project/commandPauseProject.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { exec } from "child-process-promise";
 import { getProjectNamespace } from "../../../../utils/projects";
 import { envAndComponents } from "./utils/autocompletions";

package/src/apps/cli/commands/project/commandPortForward.ts

@@ -1,10 +1,8 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
+import { getProjectPodNames } from "../../../../kubernetes";
 import { logError } from "../../../../utils/log";
 import { startPortForward } from "../../../../utils/portForward";
-import {
-  getProjectNamespace,
-  getProjectPodNames,
-} from "../../../../utils/projects";
+import { getProjectNamespace } from "../../../../utils/projects";
 import { envAndComponents } from "./utils/autocompletions";
 import ensureCluster from "./utils/ensureCluster";
 

package/src/apps/cli/commands/project/commandSetup.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { setupProject } from "./setup";
 
 export default async (vorpal: Vorpal) =>

package/src/apps/cli/commands/project/commandTriggerCronjob.ts

@@ -1,6 +1,7 @@
-import { V1Job, V1ObjectMeta } from "@kubernetes/client-node";
+import type { V1ObjectMeta } from "@kubernetes/client-node";
+import { V1Job } from "@kubernetes/client-node";
 
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { getk8sApiBatch, getk8sApiBatchBeta } from "../../../../k8sApi";
 import { logError } from "../../../../utils/log";
 import { namespaceAutoCompletion } from "../general/namespaceAutoCompletion";

package/src/apps/cli/commands/project/index.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import commandCloudSqlProxy from "./commandCloudSqlProxy";
 import commandConfigSecrets from "./commandConfigSecrets";
 import commandCopyDB from "./commandCopyDB";

package/src/apps/cli/commands/project/setup/index.ts

@@ -1,4 +1,4 @@
-import { CommandInstance } from "vorpal";
+import type { CommandInstance } from "vorpal";
 import { getAllPipelineContexts } from "../../../../../config/getProjectConfig";
 import { projectConfigSecrets } from "../commandConfigSecrets";
 import { setupAccessTokens } from "./setupAccessTokens";

package/src/apps/cli/commands/project/setup/setupAccessTokens.ts

@@ -1,5 +1,5 @@
 import open from "open";
-import { CommandInstance } from "vorpal";
+import type { CommandInstance } from "vorpal";
 import { doGitlabRequest, getProjectInfo } from "../../../../../utils/gitlab";
 
 export const setupAccessTokens = async (instance: CommandInstance) => {

package/src/apps/cli/commands/project/setup/setupContext.ts

@@ -1,5 +1,6 @@
-import { Context, isOfDeployType } from "@catladder/pipeline";
-import { CommandInstance } from "vorpal";
+import type { Context} from "@catladder/pipeline";
+import { isOfDeployType } from "@catladder/pipeline";
+import type { CommandInstance } from "vorpal";
 import { setupKubernetes } from "./setupKubernetes";
 
 export const setupContext = async (

package/src/apps/cli/commands/project/setup/setupKubernetes.ts

@@ -1,9 +1,10 @@
+import type {
+  Context} from "@catladder/pipeline";
 import {
-  Context,
   getFullKubernetesClusterName,
   isOfDeployType,
 } from "@catladder/pipeline";
-import { CommandInstance } from "vorpal";
+import type { CommandInstance } from "vorpal";
 import { exec } from "child-process-promise";
 import { connectToCluster } from "../../../../../utils/cluster";
 import { upsertAllVariables } from "../../../../../utils/gitlab";

package/src/apps/cli/commands/project/utils/ensureNamespace.ts

@@ -1,5 +1,7 @@
-import { Context, getKubernetesNamespace } from "@catladder/pipeline";
-import { V1Namespace, V1ObjectMeta } from "@kubernetes/client-node";
+import type { Context} from "@catladder/pipeline";
+import { getKubernetesNamespace } from "@catladder/pipeline";
+import type { V1ObjectMeta } from "@kubernetes/client-node";
+import { V1Namespace } from "@kubernetes/client-node";
 import { getk8sApi } from "../../../../../k8sApi";
 
 export default async function (context: Context) {

package/src/apps/cli/commands/project/utils/showProjectBanner.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import { getProjectConfig } from "../../../../../config/getProjectConfig";
 
 export const showProjectBanner = async (vorpal: Vorpal) => {

package/src/apps/cli/commands/shared/index.ts

@@ -1,4 +1,4 @@
-import { DeployConfigKubernetesCluster } from "@catladder/pipeline";
+import type { DeployConfigKubernetesCluster } from "@catladder/pipeline";
 import open from "open";
 
 export const openGoogleCloudLogs = async (

package/src/apps/cli/commands/theStuffThatReallyMatters/index.ts

@@ -1,6 +1,6 @@
 import { spawn } from "child-process-promise";
 import fetch from "node-fetch";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 
 export default async (vorpal: Vorpal) => {
   vorpal.command("dadjoke", "something for jonas.").action(async function () {

package/src/apps/cli/config/writeConfig.ts

@@ -1,9 +1,9 @@
-import { Config } from "@catladder/pipeline";
+import type { Config } from "@catladder/pipeline";
 import { spawn, exec } from "child-process-promise";
 import { writeFile } from "fs-extra";
 import { dump } from "js-yaml";
 import { format } from "prettier";
-import { CommandInstance } from "vorpal";
+import type { CommandInstance } from "vorpal";
 import { getGitRoot } from "../../../utils/projects";
 
 export const writeConfig = async (

package/src/apps/cli/verify/index.ts

@@ -1,4 +1,4 @@
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   getGitlabCi,
   getProjectConfig,

package/src/apps/cli/verify/migration/fromv2.ts

@@ -1,4 +1,4 @@
-import {
+import type {
   BuildConfig,
   ComponentConfig,
   Config,
@@ -14,7 +14,7 @@ import {
 } from "fs-extra";
 import { isEmpty } from "lodash";
 import { join } from "path";
-import Vorpal from "vorpal";
+import type Vorpal from "vorpal";
 import {
   getGitlabCi,
   getGitlabCiFilePath,
@@ -24,11 +24,8 @@ import { syncBitwarden } from "../../../../utils/passwordstore";
 import { getGitRoot } from "../../../../utils/projects";
 import { writeConfig } from "../../config/writeConfig";
 import { migrateSecrets } from "./migrateSecrets";
-import {
-  detectBuildConfig,
-  isOldInclude,
-  OldGitlabCiFile,
-} from "./oldGitlabCi";
+import type { OldGitlabCiFile } from "./oldGitlabCi";
+import { detectBuildConfig, isOldInclude } from "./oldGitlabCi";
 export const LEGACY_ENVS = [
   "dev-local",
   "dev",