hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix external extensions not loading initially

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2023-02-15 16:06:31 -05:00
parent de6f339fec
commit abd5af7be9
3 changed files with 47 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/core/src/renderer/bootstrap.tsx
View File

@ -10,8 +10,6 @@ import { render, unmountComponentAtNode } from "react-dom";
import { DefaultProps } from "./mui-base-theme"; import { DefaultProps } from "./mui-base-theme";
import { DiContextProvider } from "@ogre-tools/injectable-react"; import { DiContextProvider } from "@ogre-tools/injectable-react";
import type { DiContainer } from "@ogre-tools/injectable"; import type { DiContainer } from "@ogre-tools/injectable";
import extensionLoaderInjectable from "../extensions/extension-loader/extension-loader.injectable";
import extensionDiscoveryInjectable from "../extensions/extension-discovery/extension-discovery.injectable";
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 initRootFrameInjectable from "./frames/root-frame/init-root-frame.injectable"; import initRootFrameInjectable from "./frames/root-frame/init-root-frame.injectable";
import initClusterFrameInjectable from "./frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable"; import initClusterFrameInjectable from "./frames/cluster-frame/init-cluster-frame/init-cluster-frame.injectable";
@ -29,14 +27,6 @@ export async function bootstrap(di: DiContainer) {
assert(rootElem, "#app MUST exist"); assert(rootElem, "#app MUST exist");
const extensionLoader = di.inject(extensionLoaderInjectable);
extensionLoader.init();
const extensionDiscovery = di.inject(extensionDiscoveryInjectable);
extensionDiscovery.init();
const extensionInstallationStateStore = di.inject(extensionInstallationStateStoreInjectable); const extensionInstallationStateStore = di.inject(extensionInstallationStateStoreInjectable);
extensionInstallationStateStore.bindIpcListeners(); extensionInstallationStateStore.bindIpcListeners();
@ -54,9 +44,7 @@ export async function bootstrap(di: DiContainer) {
} }
try { try {
await initializeApp(() => { await initializeApp(() => unmountComponentAtNode(rootElem));
unmountComponentAtNode(rootElem);
});
} catch (error) { } catch (error) {
console.error(`[BOOTSTRAP]: view initialization error: ${error}`, { console.error(`[BOOTSTRAP]: view initialization error: ${error}`, {
origin: location.href, origin: location.href,

24
packages/core/src/renderer/extension-discovery/init.injectable.ts Normal file
View File

@ -0,0 +1,24 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import extensionDiscoveryInjectable from "../../extensions/extension-discovery/extension-discovery.injectable";
import { beforeFrameStartsSecondInjectionToken } from "../before-frame-starts/tokens";
import initializeExtensionLoaderInjectable from "../extension-loader/init.injectable";
const initializeExtensionDiscoveryInjectable = getInjectable({
id: "initialize-extension-discovery",
instantiate: (di) => ({
id: "initialize-extension-discovery",
run: async () => {
const extensionDiscovery = di.inject(extensionDiscoveryInjectable);
await extensionDiscovery.init();
},
runAfter: di.inject(initializeExtensionLoaderInjectable),
}),
injectionToken: beforeFrameStartsSecondInjectionToken,
});
export default initializeExtensionDiscoveryInjectable;

22
packages/core/src/renderer/extension-loader/init.injectable.ts Normal file
View File

@ -0,0 +1,22 @@
/**
* Copyright (c) OpenLens Authors. All rights reserved.
* Licensed under MIT License. See LICENSE in root directory for more information.
*/
import { getInjectable } from "@ogre-tools/injectable";
import extensionLoaderInjectable from "../../extensions/extension-loader/extension-loader.injectable";
import { beforeFrameStartsSecondInjectionToken } from "../before-frame-starts/tokens";
const initializeExtensionLoaderInjectable = getInjectable({
id: "initialize-extension-loader",
instantiate: (di) => ({
id: "initialize-extension-loader",
run: async () => {
const extensionLoader = di.inject(extensionLoaderInjectable);
await extensionLoader.init();
},
}),
injectionToken: beforeFrameStartsSecondInjectionToken,
});
export default initializeExtensionLoaderInjectable;