Fix bundled extensions not being loaded (#7359)

* Fix bundled extensions not being loaded

- Also show that this fixes it by added an example bundled
  extension to 'open-lens'

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

* Fix build

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

* Add explanatory comment for inline require

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

---------

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

packages/core/src/renderer/components/+extensions/attempt-install/attempt-install.injectable.tsx

@@ -17,7 +17,6 @@ import { disposer } from "@k8slens/utilities";
 import type { ShowNotification } from "../../notifications";
 import { Button } from "../../button";
 import type { ExtensionLoader } from "../../../../extensions/extension-loader";
-import type { LensExtensionId } from "../../../../extensions/lens-extension";
 import React from "react";
 import { remove as removeDir } from "fs-extra";
 import { shell } from "electron";
@@ -25,6 +24,7 @@ import type { ExtensionInstallationStateStore } from "../../../../extensions/ext
 import { ExtensionInstallationState } from "../../../../extensions/extension-installation-state-store/extension-installation-state-store";
 import showErrorNotificationInjectable from "../../notifications/show-error-notification.injectable";
 import showInfoNotificationInjectable from "../../notifications/show-info-notification.injectable";
+import type { LensExtensionId } from "@k8slens/legacy-extensions";
 
 export interface InstallRequest {
   fileName: string;

packages/core/src/renderer/components/+extensions/attempt-install/create-temp-files-and-validate.injectable.tsx

@@ -7,13 +7,13 @@ import extensionDiscoveryInjectable from "../../../../extensions/extension-disco
 import { validatePackage } from "./validate-package";
 import { getMessageFromError } from "../get-message-from-error/get-message-from-error";
 import React from "react";
-import type { LensExtensionId, LensExtensionManifest } from "../../../../extensions/lens-extension";
 import type { InstallRequest } from "./attempt-install.injectable";
 import loggerInjectable from "../../../../common/logger.injectable";
 import writeFileInjectable from "../../../../common/fs/write-file.injectable";
 import joinPathsInjectable from "../../../../common/path/join-paths.injectable";
 import tempDirectoryPathInjectable from "../../../../common/os/temp-directory-path.injectable";
 import showErrorNotificationInjectable from "../../notifications/show-error-notification.injectable";
+import type { LensExtensionId, LensExtensionManifest } from "@k8slens/legacy-extensions";
 
 export interface InstallRequestValidated {
   fileName: string;

packages/core/src/renderer/components/+extensions/attempt-install/validate-package.tsx

@@ -2,10 +2,10 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { LensExtensionManifest } from "../../../../extensions/lens-extension";
 import { hasTypedProperty, isObject, isString, listTarEntries, readFileFromTar } from "@k8slens/utilities";
 import { manifestFilename } from "../../../../extensions/extension-discovery/extension-discovery";
 import path from "path";
+import type { LensExtensionManifest } from "@k8slens/legacy-extensions";
 
 export async function validatePackage(filePath: string): Promise<LensExtensionManifest> {
   const tarFiles = await listTarEntries(filePath);

packages/core/src/renderer/components/+extensions/confirm-uninstall-extension.injectable.tsx

@@ -2,10 +2,9 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
+import type { LensExtensionId, InstalledExtension } from "@k8slens/legacy-extensions";
 import { getInjectable } from "@ogre-tools/injectable";
 import React from "react";
-import type { InstalledExtension } from "../../../extensions/extension-discovery/extension-discovery";
-import type { LensExtensionId } from "../../../extensions/lens-extension";
 import { extensionDisplayName } from "../../../extensions/lens-extension";
 import type { Confirm } from "../confirm-dialog/confirm.injectable";
 import confirmInjectable from "../confirm-dialog/confirm.injectable";

packages/core/src/renderer/components/+extensions/disable-extension/disable-extension.ts

@@ -2,7 +2,7 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { LensExtensionId } from "../../../../extensions/lens-extension";
+import type { LensExtensionId } from "@k8slens/legacy-extensions";
 import type { ExtensionLoader } from "../../../../extensions/extension-loader";
 
 interface Dependencies {

packages/core/src/renderer/components/+extensions/enable-extension/enable-extension.ts

@@ -2,7 +2,7 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { LensExtensionId } from "../../../../extensions/lens-extension";
+import type { LensExtensionId } from "@k8slens/legacy-extensions";
 import type { ExtensionLoader } from "../../../../extensions/extension-loader";
 
 interface Dependencies {

packages/core/src/renderer/components/+extensions/extensions.tsx

@@ -4,8 +4,7 @@
  */
 
 import styles from "./extensions.module.scss";
-import type {
-  IComputedValue } from "mobx";
+import type { IComputedValue } from "mobx";
 import {
   makeObservable,
   observable,
@@ -14,7 +13,6 @@ import {
 } from "mobx";
 import { disposeOnUnmount, observer } from "mobx-react";
 import React from "react";
-import type { InstalledExtension } from "../../../extensions/extension-discovery/extension-discovery";
 import { DropFileInput } from "../input";
 import { Install } from "./install";
 import { InstalledExtensions } from "./installed-extensions";
@@ -31,13 +29,13 @@ import confirmUninstallExtensionInjectable from "./confirm-uninstall-extension.i
 import type { InstallExtensionFromInput } from "./install-extension-from-input.injectable";
 import installExtensionFromInputInjectable from "./install-extension-from-input.injectable";
 import installFromSelectFileDialogInjectable from "./install-from-select-file-dialog.injectable";
-import type { LensExtensionId } from "../../../extensions/lens-extension";
 import type { InstallOnDrop } from "./install-on-drop.injectable";
 import installOnDropInjectable from "./install-on-drop.injectable";
 import { supportedExtensionFormats } from "./supported-extension-formats";
 import extensionInstallationStateStoreInjectable from "../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
 import type { ExtensionInstallationStateStore } from "../../../extensions/extension-installation-state-store/extension-installation-state-store";
 import Gutter from "../gutter/gutter";
+import type { InstalledExtension, LensExtensionId } from "@k8slens/legacy-extensions";
 
 interface Dependencies {
   userExtensions: IComputedValue<InstalledExtension[]>;

packages/core/src/renderer/components/+extensions/installed-extensions.tsx

@@ -5,10 +5,7 @@
 
 import styles from "./installed-extensions.module.scss";
 import React, { useMemo } from "react";
-import type {
-  ExtensionDiscovery,
-  InstalledExtension,
-} from "../../../extensions/extension-discovery/extension-discovery";
+import type { ExtensionDiscovery } from "../../../extensions/extension-discovery/extension-discovery";
 import { Icon } from "../icon";
 import { List } from "../list/list";
 import { MenuActions, MenuItem } from "../menu";
@@ -16,14 +13,11 @@ import { Spinner } from "../spinner";
 import { cssNames } from "@k8slens/utilities";
 import { observer } from "mobx-react";
 import type { Row } from "react-table";
-import type { LensExtensionId } from "../../../extensions/lens-extension";
-import extensionDiscoveryInjectable
-  from "../../../extensions/extension-discovery/extension-discovery.injectable";
-
+import extensionDiscoveryInjectable from "../../../extensions/extension-discovery/extension-discovery.injectable";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import extensionInstallationStateStoreInjectable
-  from "../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
+import extensionInstallationStateStoreInjectable from "../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
 import type { ExtensionInstallationStateStore } from "../../../extensions/extension-installation-state-store/extension-installation-state-store";
+import type { InstalledExtension, LensExtensionId } from "@k8slens/legacy-extensions";
 
 export interface InstalledExtensionsProps {
   extensions: InstalledExtension[];

packages/core/src/renderer/components/+extensions/uninstall-extension.injectable.tsx

@@ -7,7 +7,7 @@ import extensionLoaderInjectable from "../../../extensions/extension-loader/exte
 import extensionInstallationStateStoreInjectable from "../../../extensions/extension-installation-state-store/extension-installation-state-store.injectable";
 import extensionDiscoveryInjectable from "../../../extensions/extension-discovery/extension-discovery.injectable";
 import loggerInjectable from "../../../common/logger.injectable";
-import type { LensExtensionId } from "../../../extensions/lens-extension";
+import type { LensExtensionId } from "@k8slens/legacy-extensions";
 import { extensionDisplayName } from "../../../extensions/lens-extension";
 import React from "react";
 import { when } from "mobx";

packages/core/src/renderer/ipc/index.ts

@@ -7,8 +7,7 @@ import { clusterSetFrameIdHandler, clusterStates } from "../../common/ipc/cluste
 import type { ClusterId, ClusterState } from "../../common/cluster-types";
 import { windowActionHandleChannel, windowLocationChangedChannel, windowOpenAppMenuAsContextMenuChannel, type WindowAction } from "../../common/ipc/window";
 import { extensionDiscoveryStateChannel, extensionLoaderFromMainChannel } from "../../common/ipc/extension-handling";
-import type { InstalledExtension } from "../../extensions/extension-discovery/extension-discovery";
-import type { LensExtensionId } from "../../extensions/lens-extension";
+import type { InstalledExtension, LensExtensionId } from "@k8slens/legacy-extensions";
 import type { Location } from "history";
 import { getLegacyGlobalDiForExtensionApi } from "../../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api";
 import ipcRendererInjectable from "../utils/channel/ipc-renderer.injectable";