Merge branch 'master' into issue-3498

Signed-off-by: Sebastian Malton <sebastian@malton.name>

packages/core/src/common/front-end-routing/routes/welcome/welcome-route-config.injectable.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationInformationToken from "../../../vars/application-information-token";
+import { applicationInformationToken } from "../../../vars/application-information-token";
 
 const welcomeRouteConfigInjectable = getInjectable({
   id: "welcome-route-config",

packages/core/src/common/library.ts

@@ -2,15 +2,10 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import applicationInformationToken from "./vars/application-information-token";
-import type { ApplicationInformation } from "./vars/application-information-token";
-import { bundledExtensionInjectionToken } from "../extensions/extension-discovery/bundled-extension-token";
-import * as extensionApi from "../extensions/common-api";
 
 // @experimental
-export {
+export { applicationInformationToken } from "./vars/application-information-token";
-  applicationInformationToken,
+export type { ApplicationInformation } from "./vars/application-information-token";
-  ApplicationInformation,
+export { bundledExtensionInjectionToken } from "../extensions/extension-discovery/bundled-extension-token";
-  bundledExtensionInjectionToken,
+
-  extensionApi,
+export * as CommonApi from "../extensions/common-api";
-};

packages/core/src/common/vars/application-copyright.injectable.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationInformationToken from "./application-information-token";
+import { applicationInformationToken } from "./application-information-token";
 
 const applicationCopyrightInjectable = getInjectable({
   id: "application-copyright",

packages/core/src/common/vars/application-description.injectable.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationInformationToken from "./application-information-token";
+import { applicationInformationToken } from "./application-information-token";
 
 const applicationDescriptionInjectable = getInjectable({
   id: "application-description",

packages/core/src/common/vars/application-information-injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import packageJson from "../../../package.json";
-import applicationInformationToken from "../../common/vars/application-information-token";
+import { applicationInformationToken } from "../../common/vars/application-information-token";
 
 const applicationInformationInjectable = getInjectable({
   id: "application-information",

packages/core/src/common/vars/application-information-token.ts

@@ -10,8 +10,6 @@ export type ApplicationInformation = Pick<typeof packageJson, "version" | "confi
   build: Partial<typeof packageJson["build"]> & { publish?: unknown[] };
 };
 
-const applicationInformationToken = getInjectionToken<ApplicationInformation>({
+export const applicationInformationToken = getInjectionToken<ApplicationInformation>({
   id: "application-information-token",
 });
-
-export default applicationInformationToken;

packages/core/src/common/vars/bundled-kubectl-version.injectable.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationInformationToken from "./application-information-token";
+import { applicationInformationToken } from "./application-information-token";
 
 const bundledKubectlVersionInjectable = getInjectable({
   id: "bundled-kubectl-version",

packages/core/src/common/vars/content-security-policy.injectable.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationInformationToken from "./application-information-token";
+import { applicationInformationToken } from "./application-information-token";
 
 const contentSecurityPolicyInjectable = getInjectable({
   id: "content-security-policy",

packages/core/src/common/vars/product-name.injectable.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationInformationToken from "./application-information-token";
+import { applicationInformationToken } from "./application-information-token";
 
 const productNameInjectable = getInjectable({
   id: "product-name",

packages/core/src/common/vars/sentry-dsn-url.injectable.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationInformationToken from "./application-information-token";
+import { applicationInformationToken } from "./application-information-token";
 
 const sentryDataSourceNameInjectable = getInjectable({
   id: "sentry-data-source-name",

packages/core/src/extensions/main-api/index.ts

@@ -3,18 +3,9 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import * as Catalog from "./catalog";
+export * as Catalog from "./catalog";
-import * as Navigation from "./navigation";
+export * as Navigation from "./navigation";
-import * as K8sApi from "./k8s-api";
+export * as K8sApi from "./k8s-api";
-import * as Power from "./power";
+export * as Power from "./power";
-import { IpcMain as Ipc } from "../ipc/ipc-main";
+export { IpcMain as Ipc } from "../ipc/ipc-main";
-import { LensMainExtension as LensExtension } from "../lens-main-extension";
+export { LensMainExtension as LensExtension } from "../lens-main-extension";
-
-export {
-  Catalog,
-  Navigation,
-  K8sApi,
-  Ipc,
-  LensExtension,
-  Power,
-};

packages/core/src/features/application-update/main/updating-is-enabled/publish-is-configured/publish-is-configured.injectable.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationInformationToken from "../../../../../common/vars/application-information-token";
+import { applicationInformationToken } from "../../../../../common/vars/application-information-token";
 
 const publishIsConfiguredInjectable = getInjectable({
   id: "publish-is-configured",

packages/core/src/main/cluster/store-migrations/snap.injectable.ts

@@ -6,7 +6,7 @@
 // Fix embedded kubeconfig paths under snap config
 
 import { getInjectable } from "@ogre-tools/injectable";
-import applicationInformationToken from "../../../common/vars/application-information-token";
+import { applicationInformationToken } from "../../../common/vars/application-information-token";
 import { clusterStoreMigrationInjectionToken } from "../../../common/cluster-store/migration-token";
 import loggerInjectable from "../../../common/logger.injectable";
 import isSnapPackageInjectable from "../../../common/vars/is-snap-package.injectable";

packages/core/src/main/extension-api.ts

@@ -3,28 +3,11 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import * as Mobx from "mobx";
 import { spawn } from "node-pty";
-import * as LensExtensionsCommonApi from "../extensions/common-api";
-import * as LensExtensionsMainApi from "../extensions/main-api";
 
+export * as Mobx from "mobx";
+export * as MainApi from "../extensions/main-api";
 
-/**
+export const Pty = {
- * Exports for virtual package "@k8slens/extensions" for main-process.
- * All exporting names available in global runtime scope:
- * e.g. global.Mobx, global.LensExtensions
- */
-const LensExtensions = {
-  Common: LensExtensionsCommonApi,
-  Main: LensExtensionsMainApi,
-};
-
-export type {
-  LensExtensionsMainApi,
-};
-
-const Pty = {
   spawn,
 };
-
-export { Mobx, LensExtensions, Pty };

packages/core/src/main/index.ts

@@ -1,23 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-// Main process
-
-import { getDi } from "./getDi";
-import { Mobx, LensExtensions, Pty } from "./extension-api";
-import { createApp } from "./create-app";
-
-const di = getDi();
-const app = createApp({
-  di,
-  mode: process.env.NODE_ENV || "development",
-});
-
-app.start().catch((error) => {
-  console.error(error);
-  process.exit(1);
-});
-
-export { Mobx, LensExtensions, Pty };

packages/core/src/main/library.ts

@@ -2,20 +2,17 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-
+import { spawn } from "node-pty";
-import { afterApplicationIsLoadedInjectionToken } from "./start-main-application/runnable-tokens/after-application-is-loaded-injection-token";
-import { beforeApplicationIsLoadingInjectionToken } from "./start-main-application/runnable-tokens/before-application-is-loading-injection-token";
-import { beforeElectronIsReadyInjectionToken } from "./start-main-application/runnable-tokens/before-electron-is-ready-injection-token";
-import { onLoadOfApplicationInjectionToken } from "./start-main-application/runnable-tokens/on-load-of-application-injection-token";
-import * as extensionApi from "./extension-api";
-import { createApp } from "./create-app";
 
 // @experimental
-export {
+export { afterApplicationIsLoadedInjectionToken } from "./start-main-application/runnable-tokens/after-application-is-loaded-injection-token";
-  createApp,
+export { beforeApplicationIsLoadingInjectionToken } from "./start-main-application/runnable-tokens/before-application-is-loading-injection-token";
-  extensionApi,
+export { beforeElectronIsReadyInjectionToken } from "./start-main-application/runnable-tokens/before-electron-is-ready-injection-token";
-  afterApplicationIsLoadedInjectionToken,
+export { onLoadOfApplicationInjectionToken } from "./start-main-application/runnable-tokens/on-load-of-application-injection-token";
-  beforeApplicationIsLoadingInjectionToken,
+export { createApp } from "./create-app";
-  beforeElectronIsReadyInjectionToken,
+export * as Mobx from "mobx";
-  onLoadOfApplicationInjectionToken,
+export * as MainApi from "../extensions/main-api";
+
+export const Pty = {
+  spawn,
 };

packages/core/src/main/start-main-application/lens-window/application-window/create-electron-window.injectable.ts

@@ -13,7 +13,7 @@ import openLinkInBrowserInjectable from "../../../../common/utils/open-link-in-b
 import getAbsolutePathInjectable from "../../../../common/path/get-absolute-path.injectable";
 import lensResourcesDirInjectable from "../../../../common/vars/lens-resources-dir.injectable";
 import isLinuxInjectable from "../../../../common/vars/is-linux.injectable";
-import applicationInformationToken from "../../../../common/vars/application-information-token";
+import { applicationInformationToken } from "../../../../common/vars/application-information-token";
 import pathExistsSyncInjectable from "../../../../common/fs/path-exists-sync.injectable";
 import lensProxyCertificateInjectable from "../../../../common/certificate/lens-proxy-certificate.injectable";
 

packages/core/src/main/weblinks-store/migrations/currentVersion.injectable.ts

@@ -7,7 +7,7 @@ import { docsUrl, slackUrl } from "../../../common/vars";
 import type { WeblinkData } from "../../../common/weblinks-store/weblink-store";
 import { getInjectable } from "@ogre-tools/injectable";
 import { weblinkStoreMigrationInjectionToken } from "../../../common/weblinks-store/migration-token";
-import applicationInformationToken from "../../../common/vars/application-information-token";
+import { applicationInformationToken } from "../../../common/vars/application-information-token";
 import { lensDocumentationWeblinkId, lensSlackWeblinkId } from "../links";
 
 const currentVersionWeblinkStoreMigrationInjectable = getInjectable({

packages/core/src/renderer/extension-api.ts

@@ -5,33 +5,11 @@
 
 import React from "react";
 import ReactDOM from "react-dom";
-import * as Mobx from "mobx";
-import * as MobxReact from "mobx-react";
-import * as ReactRouter from "react-router";
-import * as ReactRouterDom from "react-router-dom";
-import * as LensExtensionsCommonApi from "../extensions/common-api";
-import * as LensExtensionsRendererApi from "../extensions/renderer-api";
 
-/**
+export { React, ReactDOM };
- * Exports for virtual package "@k8slens/extensions" for renderer-process.
- * All exporting names available in global runtime scope:
- * e.g. Devtools -> Console -> window.LensExtensions (renderer)
- */
-const LensExtensions = {
-  Common: LensExtensionsCommonApi,
-  Renderer: LensExtensionsRendererApi,
-};
 
-export type {
+export * as Mobx from "mobx";
-  LensExtensionsRendererApi,
+export * as MobxReact from "mobx-react";
-};
+export * as ReactRouter from "react-router";
-
+export * as ReactRouterDom from "react-router-dom";
-export {
+export * as RendererApi from "../extensions/renderer-api";
-  React,
-  ReactDOM,
-  ReactRouter,
-  ReactRouterDom,
-  Mobx,
-  MobxReact,
-  LensExtensions,
-};

packages/core/src/renderer/index.ts

@@ -1,32 +0,0 @@
-/**
- * Copyright (c) OpenLens Authors. All rights reserved.
- * Licensed under MIT License. See LICENSE in root directory for more information.
- */
-
-import "./components/app.scss";
-
-import { getDi } from "./getDi";
-import { 
-  React, ReactDOM, ReactRouter, 
-  ReactRouterDom, Mobx, MobxReact, LensExtensions,
-} from "./extension-api";
-import { createApp } from "./create-app";
-
-const di = getDi();
-const app = createApp({
-  di,
-  mode: process.env.NODE_ENV || "development",
-});
-
-// run
-app.start();
-
-export {
-  React,
-  ReactDOM,
-  ReactRouter,
-  ReactRouterDom,
-  Mobx,
-  MobxReact,
-  LensExtensions,
-};

packages/core/src/renderer/library.ts

@@ -3,12 +3,14 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import "./components/app.scss";
-
+import React from "react";
-import * as extensionApi from "./extension-api";
+import ReactDOM from "react-dom";
-import { createApp } from "./create-app";
 
 // @experimental
-export {
+export { React, ReactDOM };
-  createApp,
+export * as Mobx from "mobx";
-  extensionApi,
+export * as MobxReact from "mobx-react";
-};
+export * as ReactRouter from "react-router";
+export * as ReactRouterDom from "react-router-dom";
+export * as RendererApi from "../extensions/renderer-api";
+export { createApp } from "./create-app";

packages/extension-api/package.json

@@ -5,8 +5,8 @@
   "version": "6.4.0-beta.10",
   "copyright": "© 2022 OpenLens Authors",
   "license": "MIT",
-  "main": "dist/src/extension-api.js",
+  "main": "dist/extension-api.js",
-  "types": "dist/src/extension-api.d.ts",
+  "types": "dist/extension-api.d.ts",
   "files": [
     "dist/**/*.ts",
     "__mocks__/*.ts",

packages/extension-api/src/extension-api.ts

@@ -3,8 +3,6 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
-import { extensionApi as Main } from "@k8slens/core/main";
+export { MainApi as Main } from "@k8slens/core/main";
-import { extensionApi as Renderer } from "@k8slens/core/renderer";
+export { RendererApi as Renderer } from "@k8slens/core/renderer";
-import { extensionApi as Common } from "@k8slens/core/common";
+export { CommonApi as Common } from "@k8slens/core/common";
-
-export { Main, Renderer, Common };

packages/open-lens/src/main/index.ts

@@ -1,7 +1,8 @@
 import { createContainer } from "@ogre-tools/injectable";
 import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration";
 import { runInAction } from "mobx";
-import { createApp, extensionApi } from "@k8slens/core/main";
+import { createApp, MainApi } from "@k8slens/core/main";
+import { CommonApi } from "@k8slens/core/common";
 
 const di = createContainer("main");
 const app = createApp({
@@ -29,10 +30,12 @@ app.start().catch((error) => {
   process.exit(1);
 })
 
-const { Mobx, LensExtensions, Pty } = extensionApi;
-
 export {
   Mobx,
-  LensExtensions,
+  Pty,
-  Pty
+} from "@k8slens/core/main";
-};
+
+export const LensExtensions = {
+  Main: MainApi,
+  Common: CommonApi,
+}

packages/open-lens/src/renderer/index.ts

@@ -1,7 +1,8 @@
 import "@k8slens/core/styles";
 import { createContainer } from "@ogre-tools/injectable";
 import { runInAction } from "mobx";
-import { createApp, extensionApi } from "@k8slens/core/renderer";
+import { createApp, RendererApi } from "@k8slens/core/renderer";
+import { CommonApi } from "@k8slens/core/common";
 import { autoRegister } from "@ogre-tools/injectable-extension-for-auto-registration";
 
 const di = createContainer("renderer");
@@ -22,16 +23,6 @@ runInAction(() => {
 
 app.start();
 
-const {
-  React,
-  ReactDOM,
-  ReactRouter,
-  ReactRouterDom,
-  Mobx,
-  MobxReact,
-  LensExtensions
-} = extensionApi;
-
 export {
   React,
   ReactDOM,
@@ -39,5 +30,9 @@ export {
   ReactRouterDom,
   Mobx,
   MobxReact,
-  LensExtensions
+} from "@k8slens/core/renderer";
+
+export const LensExtensions = {
+  Renderer: RendererApi,
+  Common: CommonApi,
 };