chore: added dependencies

Signed-off-by: Gabriel <gaccettola@mirantis.com>

packages/core/package.json

@@ -309,8 +309,8 @@
     "webpack-cli": "^4.9.2",
     "webpack-dev-server": "^4.13.3",
     "webpack-node-externals": "^3.0.0",
-    "xterm": "^4.19.0",
+    "xterm": "4.17.0",
-    "xterm-addon-fit": "^0.7.0"
+    "xterm-addon-fit": "^0.5.0"
   },
   "peerDependencies": {
     "@k8slens/application": "^6.5.0-alpha.0",
@@ -358,6 +358,6 @@
     "monaco-editor": "^0.37.1",
     "react-select": "^5.7.0",
     "typed-emitter": "^1.4.0",
-    "xterm-addon-fit": "^0.7.0"
+    "xterm-addon-fit": "^0.5.0"
   }
 }

packages/core/src/extensions/as-legacy-globals-for-extension-api/as-legacy-global-singleton-object-for-extension-api.ts

@@ -3,9 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import type { Injectable } from "@ogre-tools/injectable";
-import { asLegacyGlobalForExtensionApi } from "./as-legacy-global-object-for-extension-api";
+import { asLegacyGlobalForExtensionApi, getLegacyGlobalDiForExtensionApi } from "@k8slens/legacy-global-di";
-import { getLegacyGlobalDiForExtensionApi } from "./legacy-global-di-for-extension-api";
+import { loggerInjectionToken } from "@k8slens/logger";
-import { loggerInjectable } from "@k8slens/logger";
 
 export interface LegacySingleton<T> {
   createInstance(): T;
@@ -32,7 +31,7 @@ export function asLegacyGlobalSingletonForExtensionApi<Instance, InstantiationPa
 
     resetInstance: () => {
       const di = getLegacyGlobalDiForExtensionApi();
-      const logger = di.inject(loggerInjectable);
+      const logger = di.inject(loggerInjectionToken);
 
       logger.warn(
         `resetInstance() for a legacy global singleton of "${injectable.id}" does nothing.`,

packages/core/src/main/getDiForUnitTesting.ts

@@ -28,6 +28,7 @@ import { setLegacyGlobalDiForExtensionApi } from "@k8slens/legacy-global-di";
 import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";
 import { registerFeature } from "@k8slens/feature-core";
 import { messagingFeature, testUtils as messagingTestUtils } from "@k8slens/messaging";
+import { loggerFeature } from "@k8slens/logger";
 
 export function getDiForUnitTesting() {
   const environment = "main";
@@ -40,8 +41,9 @@ export function getDiForUnitTesting() {
 
   runInAction(() => {
     registerFeature(di,
-        messagingFeature,
+      messagingFeature,
-        messagingTestUtils.messagingFeatureForUnitTesting
+      messagingTestUtils.messagingFeatureForUnitTesting,
+      loggerFeature,
     );
   });
 

packages/core/src/renderer/components/config-maps/config-map-details.tsx

@@ -13,7 +13,7 @@ import type { ShowNotification } from "../notifications";
 import { Button } from "@k8slens/button";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { ConfigMap } from "@k8slens/kube-object";
-import type { Logger } from "../../../common/logger";
+import type { Logger } from "@k8slens/logger";
 import type { ConfigMapStore } from "./store";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import configMapStoreInjectable from "./store.injectable";

packages/core/src/renderer/components/custom-resources/crd-resource-details.tsx

@@ -14,7 +14,7 @@ import type { KubeObjectDetailsProps } from "../kube-object-details";
 import { Input } from "../input";
 import type { AdditionalPrinterColumnsV1, KubeObjectMetadata, KubeObjectStatus } from "@k8slens/kube-object";
 import { CustomResourceDefinition, KubeObject } from "@k8slens/kube-object";
-import type { Logger } from "../../../common/logger";
+import type { Logger } from "@k8slens/logger";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import { loggerInjectionToken } from "@k8slens/logger";
 

packages/core/src/renderer/components/workloads-cronjobs/cronjob-details.tsx

@@ -16,7 +16,7 @@ import type { CronJobStore } from "./store";
 import type { KubeObjectDetailsProps } from "../kube-object-details";
 import type { Job } from "@k8slens/kube-object";
 import { CronJob } from "@k8slens/kube-object";
-import type { Logger } from "../../../common/logger";
+import type { Logger } from "@k8slens/logger";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api";
 import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable";

packages/core/src/renderer/getDiForUnitTesting.tsx

@@ -34,10 +34,11 @@ export const getDiForUnitTesting = () => {
 
   runInAction(() => {
     registerFeature(di,
-        messagingFeature,
+      messagingFeature,
-        messagingTestUtils.messagingFeatureForUnitTesting,
+      messagingTestUtils.messagingFeatureForUnitTesting,
-        routingFeature,
+      routingFeature,
-        loggerFeature);
+      loggerFeature,
+    );
   });
 
   di.preventSideEffects();

packages/list-layout/index.ts

@@ -1,4 +1,22 @@
-export * from "./src/list-layout-column";
+/**
-export * from "./src/general-kube-column-token";
+ * Copyright (c) OpenLens Authors. All rights reserved.
-export * from "./src/kube-list-layout-column";
+ * Licensed under MIT License. See LICENSE in root directory for more information.
-export * from "./src/pod-list-layout-token";
+ */
+
+export type {
+  ItemObject,
+  TableSortBy,
+  TableOrderBy,
+  TableSortCallback,
+  SearchFilter,
+  TableSortParams,
+  TableCellProps,
+  TableSortCallbacks,
+} from "./src/list-layout-column";
+export { kubeObjectListLayoutColumnInjectionToken } from "./src/general-kube-column-token";
+export type {
+  BaseKubeObjectListLayoutColumn,
+  GeneralKubeObjectListLayoutColumn,
+  SpecificKubeListLayoutColumn,
+} from "./src/kube-list-layout-column";
+export { podListLayoutColumnInjectionToken } from "./src/pod-list-layout-token";

packages/logger/package.json

@@ -32,7 +32,7 @@
     "@k8slens/feature-core": "^6.5.0-alpha.0",
     "@k8slens/react-application": "^1.0.0-alpha.0",
     "@ogre-tools/fp": "^15.3.1",
-    "@ogre-tools/injectable": "^15.3.1",
+    "@ogre-tools/injectable": "^15.8.1",
     "@ogre-tools/injectable-extension-for-auto-registration": "^15.3.0",
     "@ogre-tools/injectable-react": "^15.3.0",
     "auto-bind": "^4.0.0",

packages/logger/src/feature.ts

@@ -13,5 +13,4 @@ export const loggerFeature = getFeature({
       ],
     });
   },
-
 });

packages/logger/src/logger.ts

@@ -3,7 +3,6 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-
 export interface Logger {
   info: (message: string, ...args: any) => void;
   error: (message: string, ...args: any) => void;

packages/logger/src/transports.ts

@@ -6,6 +6,8 @@
 import { getInjectionToken } from "@ogre-tools/injectable";
 import type TransportStream from "winston-transport";
 
-export const loggerTransportInjectionToken = getInjectionToken<TransportStream>({
+export const loggerTransportInjectionToken = getInjectionToken<TransportStream>(
-  id: "logger-transport",
+  {
-});
+    id: "logger-transport",
+  }
+);

packages/open-lens/package.json

@@ -192,6 +192,7 @@
     "@k8slens/legacy-extension-example": "^1.0.0-alpha.6",
     "@k8slens/legacy-extensions": "^1.0.0-alpha.3",
     "@k8slens/legacy-global-di": "^1.0.0-alpha.0",
+    "@k8slens/logger": "^1.0.0-alpha.5",
     "@k8slens/messaging": "^1.0.0-alpha.3",
     "@k8slens/messaging-for-main": "^1.0.0-alpha.3",
     "@k8slens/messaging-for-renderer": "^1.0.0-alpha.3",
@@ -274,6 +275,6 @@
     "webpack-cli": "^4.9.2",
     "webpack-dev-server": "^4.13.3",
     "webpack-node-externals": "^3.0.0",
-    "xterm-addon-fit": "^0.7.0"
+    "xterm-addon-fit": "^0.5.0"
   }
 }