@k8slens/extensions 5.4.1-git.125a47a56d.0 → 5.4.1-git.231e01c933.0

package/dist/src/main/kubeconfig-manager/create-kubeconfig-manager.injectable.d.ts

@@ -4,5 +4,5 @@ import { KubeconfigManager } from "./kubeconfig-manager";
 export interface KubeConfigManagerInstantiationParameter {
     cluster: Cluster;
 }
-declare const createKubeconfigManagerInjectable: import("@ogre-tools/injectable").NormalInjectable<(cluster: Cluster) => KubeconfigManager, unknown>;
+declare const createKubeconfigManagerInjectable: import("@ogre-tools/injectable").Injectable<(cluster: Cluster) => KubeconfigManager, unknown, void>;
 export default createKubeconfigManagerInjectable;

package/dist/src/main/kubectl/bundled-kubectl.injectable.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="@ogre-tools/injectable" />
-declare const bundledKubectlInjectable: import("@ogre-tools/injectable").NormalInjectable<import("./kubectl").Kubectl, unknown>;
+declare const bundledKubectlInjectable: import("@ogre-tools/injectable").Injectable<import("./kubectl").Kubectl, unknown, void>;
 export default bundledKubectlInjectable;

package/dist/src/main/kubectl/create-kubectl.injectable.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="@ogre-tools/injectable" />
 import { Kubectl } from "./kubectl";
-declare const createKubectlInjectable: import("@ogre-tools/injectable").NormalInjectable<(clusterVersion: string) => Kubectl, unknown>;
+declare const createKubectlInjectable: import("@ogre-tools/injectable").Injectable<(clusterVersion: string) => Kubectl, unknown, void>;
 export default createKubectlInjectable;

package/dist/src/main/kubectl/directory-for-kubectl-binaries/directory-for-kubectl-binaries.injectable.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="@ogre-tools/injectable" />
-declare const directoryForKubectlBinariesInjectable: import("@ogre-tools/injectable").NormalInjectable<string, unknown>;
+declare const directoryForKubectlBinariesInjectable: import("@ogre-tools/injectable").Injectable<string, unknown, void>;
 export default directoryForKubectlBinariesInjectable;

package/dist/src/main/kubectl/kubectl.d.ts

@@ -2,7 +2,6 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-export declare function bundledKubectlPath(): string;
 interface Dependencies {
     directoryForKubectlBinaries: string;
     userStore: {

package/dist/src/main/lens-proxy.d.ts

@@ -4,8 +4,8 @@
  */
 /// <reference types="node" />
 import type http from "http";
-import httpProxy from "http-proxy";
-import type { Router } from "./router";
+import type httpProxy from "http-proxy";
+import type { Router } from "./router/router";
 import type { ContextHandler } from "./context-handler/context-handler";
 import { Singleton } from "../common/utils";
 import type { Cluster } from "../common/cluster/cluster";
@@ -14,19 +14,19 @@ declare type GetClusterForRequest = (req: http.IncomingMessage) => Cluster | nul
 export interface LensProxyFunctions {
     getClusterForRequest: GetClusterForRequest;
     shellApiRequest: (args: ProxyApiRequestArgs) => void | Promise<void>;
-    kubeApiRequest: (args: ProxyApiRequestArgs) => void | Promise<void>;
+    kubeApiUpgradeRequest: (args: ProxyApiRequestArgs) => void | Promise<void>;
 }
 export declare function isLongRunningRequest(reqUrl: string): boolean;
 export declare class LensProxy extends Singleton {
     protected router: Router;
+    protected proxy: httpProxy;
     protected origin: string;
     protected proxyServer: http.Server;
     protected closed: boolean;
     protected retryCounters: Map<string, number>;
-    protected proxy: httpProxy;
     protected getClusterForRequest: GetClusterForRequest;
     port: number;
-    constructor(router: Router, { shellApiRequest, kubeApiRequest, getClusterForRequest }: LensProxyFunctions);
+    constructor(router: Router, proxy: httpProxy, { shellApiRequest, kubeApiUpgradeRequest, getClusterForRequest }: LensProxyFunctions);
     /**
      * Starts to listen on an OS provided port. Will reject if the server throws
      * an error.
@@ -41,7 +41,7 @@ export declare class LensProxy extends Singleton {
      */
     listen(): Promise<void>;
     close(): void;
-    protected createProxy(): httpProxy;
+    protected configureProxy(proxy: httpProxy): httpProxy;
     protected getProxyTarget(req: http.IncomingMessage, contextHandler: ContextHandler): Promise<httpProxy.ServerOptions | void>;
     protected getRequestId(req: http.IncomingMessage): string;
     protected handleRequest(req: http.IncomingMessage, res: http.ServerResponse): Promise<void>;

package/dist/src/main/menu/electron-menu-items.injectable.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="@ogre-tools/injectable" />
-declare const electronMenuItemsInjectable: import("@ogre-tools/injectable").NormalInjectable<import("mobx").IComputedValue<import("./menu-registration").MenuRegistration[]>, unknown>;
+declare const electronMenuItemsInjectable: import("@ogre-tools/injectable").Injectable<import("mobx").IComputedValue<import("./menu-registration").MenuRegistration[]>, unknown, void>;
 export default electronMenuItemsInjectable;

package/dist/src/main/native-theme.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+export declare function broadcastNativeThemeOnUpdate(): void;
+export declare function getNativeColorTheme(): "dark" | "light";

package/dist/src/main/protocol-handler/lens-protocol-router-main/lens-protocol-router-main.injectable.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="@ogre-tools/injectable" />
 import { LensProtocolRouterMain } from "./lens-protocol-router-main";
-declare const lensProtocolRouterMainInjectable: import("@ogre-tools/injectable").NormalInjectable<LensProtocolRouterMain, unknown>;
+declare const lensProtocolRouterMainInjectable: import("@ogre-tools/injectable").Injectable<LensProtocolRouterMain, unknown, void>;
 export default lensProtocolRouterMainInjectable;

package/dist/src/main/proxy-functions/index.d.ts

@@ -2,5 +2,5 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-export * from "./kube-api-request";
+export * from "./kube-api-upgrade-request";
 export * from "./types";

package/dist/src/main/proxy-functions/{kube-api-request.d.ts → kube-api-upgrade-request.d.ts}

@@ -3,4 +3,4 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import type { ProxyApiRequestArgs } from "./types";
-export declare function kubeApiRequest({ req, socket, head, cluster }: ProxyApiRequestArgs): Promise<void>;
+export declare function kubeApiUpgradeRequest({ req, socket, head, cluster }: ProxyApiRequestArgs): Promise<void>;

package/dist/src/main/proxy-functions/shell-api-request/shell-api-request.injectable.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="@ogre-tools/injectable" />
-declare const shellApiRequestInjectable: import("@ogre-tools/injectable").NormalInjectable<({ req, socket, head }: import("..").ProxyApiRequestArgs) => void, unknown>;
+declare const shellApiRequestInjectable: import("@ogre-tools/injectable").Injectable<({ req, socket, head }: import("..").ProxyApiRequestArgs) => void, unknown, void>;
 export default shellApiRequestInjectable;

package/dist/src/main/proxy-functions/shell-api-request/shell-request-authenticator/shell-request-authenticator.injectable.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="@ogre-tools/injectable" />
 import { ShellRequestAuthenticator } from "./shell-request-authenticator";
-declare const shellRequestAuthenticatorInjectable: import("@ogre-tools/injectable").NormalInjectable<ShellRequestAuthenticator, unknown>;
+declare const shellRequestAuthenticatorInjectable: import("@ogre-tools/injectable").Injectable<ShellRequestAuthenticator, unknown, void>;
 export default shellRequestAuthenticatorInjectable;

package/dist/src/main/router/parse-request.injectable.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="@ogre-tools/injectable" />
+declare const parseRequestInjectable: import("@ogre-tools/injectable").Injectable<any, unknown, void>;
+export default parseRequestInjectable;

package/dist/src/main/router/router-content-types.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { LensApiResult } from "./router";
+export interface LensApiResultContentType {
+    resultMapper: (result: LensApiResult<any>) => ({
+        statusCode: number;
+        content: any;
+        headers: Record<string, string>;
+    });
+}
+export declare type SupportedFileExtension = "json" | "txt" | "html" | "css" | "gif" | "jpg" | "png" | "svg" | "js" | "woff2" | "ttf";
+export declare const contentTypes: Record<SupportedFileExtension, LensApiResultContentType>;

package/dist/src/main/{router.d.ts → router/router.d.ts}

@@ -4,7 +4,10 @@
  */
 /// <reference types="node" />
 import type http from "http";
-import type { Cluster } from "../common/cluster/cluster";
+import type httpProxy from "http-proxy";
+import type { Cluster } from "../../common/cluster/cluster";
+import type { LensApiResultContentType } from "./router-content-types";
+import "../../common/vars";
 export interface RouterRequestOpts {
     req: http.IncomingMessage;
     res: http.ServerResponse;
@@ -26,23 +29,42 @@ export interface LensApiRequest<P = any> {
     payload: P;
     params: RouteParams;
     cluster: Cluster;
-    response: http.ServerResponse;
     query: URLSearchParams;
     raw: {
         req: http.IncomingMessage;
+        res: http.ServerResponse;
     };
 }
 interface Dependencies {
-    routePortForward: (request: LensApiRequest) => Promise<void>;
+    parseRequest: (request: http.IncomingMessage, _: null, options: {
+        parse: boolean;
+        output: string;
+    }) => Promise<{
+        payload: any;
+    }>;
 }
 export declare class Router {
     private dependencies;
     protected router: any;
     protected static rootPath: string;
-    constructor(dependencies: Dependencies);
+    constructor(routes: Route<unknown>[], dependencies: Dependencies);
     route(cluster: Cluster, req: http.IncomingMessage, res: http.ServerResponse): Promise<boolean>;
     protected getRequest(opts: RouterRequestOpts): Promise<LensApiRequest>;
-    protected static handleStaticFile({ params, response }: LensApiRequest): Promise<void>;
-    protected addRoutes(): void;
+}
+export interface LensApiResult<TResult> {
+    statusCode?: number;
+    response?: TResult;
+    error?: any;
+    contentType?: LensApiResultContentType;
+    headers?: {
+        [name: string]: string;
+    };
+    proxy?: httpProxy;
+}
+export declare type RouteHandler<TResponse> = (request: LensApiRequest) => Promise<LensApiResult<TResponse>> | Promise<void> | LensApiResult<TResponse> | void;
+export interface Route<TResponse> {
+    path: string;
+    method: "get" | "post" | "put" | "patch" | "delete";
+    handler: RouteHandler<TResponse>;
 }
 export {};

package/dist/src/main/router/router.injectable.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="@ogre-tools/injectable" />
-import { Router } from "../router";
-declare const routerInjectable: import("@ogre-tools/injectable").NormalInjectable<Router, unknown>;
+import { Route, Router } from "./router";
+export declare const routeInjectionToken: import("@ogre-tools/injectable").InjectionToken<Route<any>, void>;
+declare const routerInjectable: import("@ogre-tools/injectable").Injectable<Router, unknown, void>;
 export default routerInjectable;

package/dist/src/main/router/router.test.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+export {};

package/dist/src/main/routes/helm/charts/get-chart-route.injectable.d.ts

@@ -0,0 +1,9 @@
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../../router/router";
+import type { RawHelmChart } from "../../../../common/k8s-api/endpoints/helm-charts.api";
+interface GetChartResponse {
+    readme: string;
+    versions: RawHelmChart[];
+}
+declare const getChartRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<GetChartResponse>, Route<any>, void>;
+export default getChartRouteInjectable;

package/dist/src/main/routes/helm/charts/get-chart-values-route.injectable.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../../router/router";
+declare const getChartRouteValuesInjectable: import("@ogre-tools/injectable").Injectable<Route<string>, Route<any>, void>;
+export default getChartRouteValuesInjectable;

package/dist/src/main/routes/helm/charts/list-charts-route.injectable.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../../router/router";
+declare const listChartsRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<any>, Route<any>, void>;
+export default listChartsRouteInjectable;

package/dist/src/main/routes/helm/releases/delete-release-route.injectable.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../../router/router";
+declare const deleteReleaseRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<string>, Route<any>, void>;
+export default deleteReleaseRouteInjectable;

package/dist/src/main/routes/helm/releases/get-release-history-route.injectable.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../../router/router";
+declare const getReleaseRouteHistoryInjectable: import("@ogre-tools/injectable").Injectable<Route<any>, Route<any>, void>;
+export default getReleaseRouteHistoryInjectable;

package/dist/src/main/routes/helm/releases/get-release-route.injectable.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../../router/router";
+declare const getReleaseRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<any>, Route<any>, void>;
+export default getReleaseRouteInjectable;

package/dist/src/main/routes/helm/releases/get-release-values-route.injectable.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../../router/router";
+declare const getReleaseRouteValuesInjectable: import("@ogre-tools/injectable").Injectable<Route<string>, Route<any>, void>;
+export default getReleaseRouteValuesInjectable;

package/dist/src/main/routes/helm/releases/install-chart-route.injectable.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../../router/router";
+interface InstallChartResponse {
+    log: string;
+    release: {
+        name: string;
+        namespace: string;
+    };
+}
+declare const installChartRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<InstallChartResponse>, Route<any>, void>;
+export default installChartRouteInjectable;

package/dist/src/main/routes/helm/releases/list-releases-route.injectable.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../../router/router";
+declare const listReleasesRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<Record<string, any>>, Route<any>, void>;
+export default listReleasesRouteInjectable;

package/dist/src/main/routes/helm/releases/rollback-release-route.injectable.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../../router/router";
+declare const rollbackReleaseRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<void>, Route<any>, void>;
+export default rollbackReleaseRouteInjectable;

package/dist/src/main/routes/helm/releases/update-release-route.injectable.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../../router/router";
+interface UpdateReleaseResponse {
+    log: string;
+    release: {
+        name: string;
+        namespace: string;
+    };
+}
+declare const updateReleaseRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<UpdateReleaseResponse>, Route<any>, void>;
+export default updateReleaseRouteInjectable;

package/dist/src/main/routes/kubeconfig-route/get-service-account-route.injectable.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../router/router";
+declare const getServiceAccountRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<{
+    apiVersion: string;
+    kind: string;
+    clusters: {
+        name: string;
+        cluster: {
+            server: string;
+            "certificate-authority-data": string;
+        };
+    }[];
+    users: {
+        name: string;
+        user: {
+            token: string;
+        };
+    }[];
+    contexts: {
+        name: string;
+        context: {
+            user: string;
+            cluster: string;
+            namespace: string;
+        };
+    }[];
+    "current-context": string;
+}>, Route<any>, void>;
+export default getServiceAccountRouteInjectable;

package/dist/src/main/routes/metrics/add-metrics-route.injectable.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../router/router";
+declare const addMetricsRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<any>, Route<any>, void>;
+export default addMetricsRouteInjectable;

package/dist/src/main/routes/metrics/get-metric-providers-route.injectable.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../router/router";
+import type { MetricProviderInfo } from "../../../common/k8s-api/endpoints/metrics.api";
+declare const getMetricProvidersRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<MetricProviderInfo[]>, Route<any>, void>;
+export default getMetricProvidersRouteInjectable;

package/dist/src/main/routes/metrics/metrics-query.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+export declare type IMetricsQuery = string | string[] | {
+    [metricName: string]: string;
+};

package/dist/src/main/routes/port-forward/{create-port-forward.injectable.d.ts → functionality/create-port-forward.injectable.d.ts}

@@ -1,4 +1,4 @@
 /// <reference types="@ogre-tools/injectable" />
 import { PortForward, PortForwardArgs } from "./port-forward";
-declare const createPortForwardInjectable: import("@ogre-tools/injectable").NormalInjectable<(pathToKubeConfig: string, args: PortForwardArgs) => PortForward, unknown>;
+declare const createPortForwardInjectable: import("@ogre-tools/injectable").Injectable<(pathToKubeConfig: string, args: PortForwardArgs) => PortForward, unknown, void>;
 export default createPortForwardInjectable;

package/dist/src/main/routes/port-forward/get-current-port-forward-route.injectable.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../router/router";
+declare const getCurrentPortForwardRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<{
+    port: number;
+}>, Route<any>, void>;
+export default getCurrentPortForwardRouteInjectable;

package/dist/src/main/routes/port-forward/start-port-forward-route.injectable.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../router/router";
+declare const startPortForwardRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<{
+    port: number;
+}>, Route<any>, void>;
+export default startPortForwardRouteInjectable;

package/dist/src/main/routes/port-forward/stop-current-port-forward-route.injectable.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../router/router";
+declare const stopCurrentPortForwardRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<{
+    status: boolean;
+}>, Route<any>, void>;
+export default stopCurrentPortForwardRouteInjectable;

package/dist/src/main/routes/resource-applier/apply-resource-route.injectable.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../router/router";
+declare const applyResourceRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<string>, Route<any>, void>;
+export default applyResourceRouteInjectable;

package/dist/src/main/routes/resource-applier/patch-resource-route.injectable.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../router/router";
+declare const patchResourceRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<string>, Route<any>, void>;
+export default patchResourceRouteInjectable;

package/dist/src/main/routes/static-file-route.injectable.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="node" />
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../router/router";
+declare const staticFileRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<Buffer>, Route<any>, void>;
+export default staticFileRouteInjectable;

package/dist/src/main/routes/versions/get-version-route.injectable.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="@ogre-tools/injectable" />
+import type { Route } from "../../router/router";
+declare const getVersionRouteInjectable: import("@ogre-tools/injectable").Injectable<Route<{
+    version: string;
+}>, Route<any>, void>;
+export default getVersionRouteInjectable;

package/dist/src/main/shell-session/create-shell-session.injectable.d.ts

@@ -7,5 +7,5 @@ interface Args {
     tabId: string;
     nodeName?: string;
 }
-declare const createShellSessionInjectable: import("@ogre-tools/injectable").NormalInjectable<({ nodeName, ...rest }: Args) => import(".").LocalShellSession | import(".").NodeShellSession, unknown>;
+declare const createShellSessionInjectable: import("@ogre-tools/injectable").Injectable<({ nodeName, ...rest }: Args) => import(".").LocalShellSession | import(".").NodeShellSession, unknown, void>;
 export default createShellSessionInjectable;

package/dist/src/main/shell-session/local-shell-session/local-shell-session.injectable.d.ts

@@ -7,5 +7,5 @@ interface InstantiationParameter {
     cluster: Cluster;
     tabId: string;
 }
-declare const localShellSessionInjectable: import("@ogre-tools/injectable").NormalInjectable<LocalShellSession, InstantiationParameter>;
+declare const localShellSessionInjectable: import("@ogre-tools/injectable").Injectable<LocalShellSession, unknown, InstantiationParameter>;
 export default localShellSessionInjectable;

package/dist/src/main/shell-session/node-shell-session/node-shell-session.injectable.d.ts

@@ -8,5 +8,5 @@ interface InstantiationParameter {
     tabId: string;
     nodeName: string;
 }
-declare const nodeShellSessionInjectable: import("@ogre-tools/injectable").NormalInjectable<NodeShellSession, InstantiationParameter>;
+declare const nodeShellSessionInjectable: import("@ogre-tools/injectable").Injectable<NodeShellSession, unknown, InstantiationParameter>;
 export default nodeShellSessionInjectable;

package/dist/src/main/shell-session/shell-env-modifier/terminal-shell-env-modify.injectable.d.ts

@@ -3,5 +3,5 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 /// <reference types="@ogre-tools/injectable" />
-declare const terminalShellEnvModifyInjectable: import("@ogre-tools/injectable").NormalInjectable<(clusterId: string, env: Record<string, string>) => Record<string, string>, unknown>;
+declare const terminalShellEnvModifyInjectable: import("@ogre-tools/injectable").Injectable<(clusterId: string, env: Record<string, string>) => Record<string, string>, unknown, void>;
 export default terminalShellEnvModifyInjectable;

package/dist/src/main/tray/tray-menu-items.injectable.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="@ogre-tools/injectable" />
-declare const trayItemsInjectable: import("@ogre-tools/injectable").NormalInjectable<import("mobx").IComputedValue<import("./tray-menu-registration").TrayMenuRegistration[]>, unknown>;
+declare const trayItemsInjectable: import("@ogre-tools/injectable").Injectable<import("mobx").IComputedValue<import("./tray-menu-registration").TrayMenuRegistration[]>, unknown, void>;
 export default trayItemsInjectable;

package/dist/src/renderer/api/catalog-entity-registry/catalog-entity-registry.injectable.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="@ogre-tools/injectable" />
-declare const catalogEntityRegistryInjectable: import("@ogre-tools/injectable").NormalInjectable<import("../catalog-entity-registry").CatalogEntityRegistry, unknown>;
+declare const catalogEntityRegistryInjectable: import("@ogre-tools/injectable").Injectable<import("../catalog-entity-registry").CatalogEntityRegistry, unknown, void>;
 export default catalogEntityRegistryInjectable;

package/dist/src/renderer/app-paths/app-paths.injectable.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="@ogre-tools/injectable" />
 import { AppPaths } from "../../common/app-paths/app-path-injection-token";
-declare const appPathsInjectable: import("@ogre-tools/injectable").InjectionTokenInjectable<import("@ogre-tools/injectable").InjectionToken<AppPaths, void>>;
+declare const appPathsInjectable: import("@ogre-tools/injectable").Injectable<AppPaths, AppPaths, void>;
 export default appPathsInjectable;

package/dist/src/renderer/app-paths/get-value-from-registered-channel/get-value-from-registered-channel.injectable.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="@ogre-tools/injectable" />
-declare const getValueFromRegisteredChannelInjectable: import("@ogre-tools/injectable").NormalInjectable<(<TChannel extends import("../../../common/ipc-channel/channel").Channel<TInstance>, TInstance>(channel: TChannel) => Promise<TChannel["_template"]>), unknown>;
+declare const getValueFromRegisteredChannelInjectable: import("@ogre-tools/injectable").Injectable<(<TChannel extends import("../../../common/ipc-channel/channel").Channel<TInstance>, TInstance>(channel: TChannel) => Promise<TChannel["_template"]>), unknown, void>;
 export default getValueFromRegisteredChannelInjectable;

package/dist/src/renderer/app-paths/get-value-from-registered-channel/ipc-renderer/ipc-renderer.injectable.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="electron" />
 /// <reference types="@ogre-tools/injectable" />
-declare const ipcRendererInjectable: import("@ogre-tools/injectable").NormalInjectable<Electron.IpcRenderer, unknown>;
+declare const ipcRendererInjectable: import("@ogre-tools/injectable").Injectable<Electron.IpcRenderer, unknown, void>;
 export default ipcRendererInjectable;

package/dist/src/renderer/cluster-frame-context/cluster-frame-context.injectable.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="@ogre-tools/injectable" />
 import { ClusterFrameContext } from "./cluster-frame-context";
-declare const clusterFrameContextInjectable: import("@ogre-tools/injectable").NormalInjectable<ClusterFrameContext, unknown>;
+declare const clusterFrameContextInjectable: import("@ogre-tools/injectable").Injectable<ClusterFrameContext, unknown, void>;
 export default clusterFrameContextInjectable;

package/dist/src/renderer/components/+add-cluster/add-cluster.d.ts

@@ -3,6 +3,4 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import React from "react";
-export declare const AddCluster: React.ForwardRefExoticComponent<React.RefAttributes<any> & {
-    children?: React.ReactNode;
-}>;
+export declare const AddCluster: React.FunctionComponent<{}>;

package/dist/src/renderer/components/+catalog/catalog-entity-store/catalog-entity-store.injectable.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="@ogre-tools/injectable" />
 import { CatalogEntityStore } from "./catalog-entity.store";
-declare const catalogEntityStoreInjectable: import("@ogre-tools/injectable").NormalInjectable<CatalogEntityStore, unknown>;
+declare const catalogEntityStoreInjectable: import("@ogre-tools/injectable").Injectable<CatalogEntityStore, unknown, void>;
 export default catalogEntityStoreInjectable;

package/dist/src/renderer/components/+catalog/catalog-previous-active-tab-storage/catalog-previous-active-tab-storage.injectable.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="@ogre-tools/injectable" />
-declare const catalogPreviousActiveTabStorageInjectable: import("@ogre-tools/injectable").NormalInjectable<import("../../../utils").StorageHelper<string>, unknown>;
+declare const catalogPreviousActiveTabStorageInjectable: import("@ogre-tools/injectable").Injectable<import("../../../utils").StorageHelper<string>, unknown, void>;
 export default catalogPreviousActiveTabStorageInjectable;

package/dist/src/renderer/components/+catalog/catalog.d.ts

@@ -7,6 +7,4 @@ import type { RouteComponentProps } from "react-router";
 import { CatalogViewRouteParam } from "../../../common/routes";
 export interface CatalogProps extends RouteComponentProps<CatalogViewRouteParam> {
 }
-export declare const Catalog: React.ForwardRefExoticComponent<CatalogProps & React.RefAttributes<any> & {
-    children?: React.ReactNode;
-}>;
+export declare const Catalog: React.FunctionComponent<CatalogProps>;

package/dist/src/renderer/components/+catalog/custom-category-columns.injectable.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="@ogre-tools/injectable" />
 import { IComputedValue } from "mobx";
 import type { RegisteredAdditionalCategoryColumn } from "./custom-category-columns";
-declare const categoryColumnsInjectable: import("@ogre-tools/injectable").NormalInjectable<IComputedValue<Map<string, Map<string, RegisteredAdditionalCategoryColumn[]>>>, unknown>;
+declare const categoryColumnsInjectable: import("@ogre-tools/injectable").Injectable<IComputedValue<Map<string, Map<string, RegisteredAdditionalCategoryColumn[]>>>, unknown, void>;
 export default categoryColumnsInjectable;

package/dist/src/renderer/components/+catalog/custom-views.injectable.d.ts

@@ -11,5 +11,5 @@ export interface RegisteredCustomCategoryViewDecl {
      */
     after: CustomCategoryViewComponents[];
 }
-declare const customCategoryViewsInjectable: import("@ogre-tools/injectable").NormalInjectable<IComputedValue<Map<string, Map<string, RegisteredCustomCategoryViewDecl>>>, unknown>;
+declare const customCategoryViewsInjectable: import("@ogre-tools/injectable").Injectable<IComputedValue<Map<string, Map<string, RegisteredCustomCategoryViewDecl>>>, unknown, void>;
 export default customCategoryViewsInjectable;

package/dist/src/renderer/components/+catalog/get-category-columns.injectable.d.ts

@@ -5,5 +5,5 @@ export interface GetCategoryColumnsParams {
     activeCategory: CatalogCategory | null | undefined;
 }
 export declare type CategoryColumns = Required<Pick<ItemListLayoutProps<CatalogEntity>, "sortingCallbacks" | "searchFilters" | "renderTableContents" | "renderTableHeader">>;
-declare const getCategoryColumnsInjectable: import("@ogre-tools/injectable").NormalInjectable<({ activeCategory }: GetCategoryColumnsParams) => CategoryColumns, unknown>;
+declare const getCategoryColumnsInjectable: import("@ogre-tools/injectable").Injectable<({ activeCategory }: GetCategoryColumnsParams) => CategoryColumns, unknown, void>;
 export default getCategoryColumnsInjectable;

package/dist/src/renderer/components/+cluster/cluster-issues.d.ts

@@ -11,11 +11,10 @@ interface IWarning extends ItemObject {
     kind: string;
     message: string;
     selfLink: string;
-    age: string | number;
-    timeDiffFromNow: number;
+    renderAge: () => React.ReactElement;
+    ageMs: number;
 }
 export declare class ClusterIssues extends React.Component<ClusterIssuesProps> {
-    private sortCallbacks;
     constructor(props: ClusterIssuesProps);
     get warnings(): IWarning[];
     getTableRow(uid: string): JSX.Element;

package/dist/src/renderer/components/+cluster/cluster-metric-switchers.d.ts

@@ -3,6 +3,4 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import React from "react";
-export declare const ClusterMetricSwitchers: React.ForwardRefExoticComponent<React.RefAttributes<any> & {
-    children?: React.ReactNode;
-}>;
+export declare const ClusterMetricSwitchers: React.FunctionComponent<{}>;