diff --git a/src/extensions/extension-discovery/extension-discovery.ts b/src/extensions/extension-discovery/extension-discovery.ts index bd8c673a3f..f5ab10b41d 100644 --- a/src/extensions/extension-discovery/extension-discovery.ts +++ b/src/extensions/extension-discovery/extension-discovery.ts @@ -24,6 +24,7 @@ import type { LensExtensionId, LensExtensionManifest } from "../lens-extension"; import { isProduction } from "../../common/vars"; import type { ExtensionInstallationStateStore } from "../extension-installation-state-store/extension-installation-state-store"; import type { PackageJson } from "type-fest"; +import type { LensExtensionUpdateChecker } from "../lens-extension-update-checker"; interface Dependencies { extensionLoader: ExtensionLoader; @@ -57,6 +58,7 @@ export interface InstalledExtension { version: string; input: string; } + updateChecker?: LensExtensionUpdateChecker } const logModule = "[EXTENSION-DISCOVERY]"; diff --git a/src/extensions/extension-loader/create-extension-instance/create-extension-instance.ts b/src/extensions/extension-loader/create-extension-instance/create-extension-instance.ts index 344bf26cfc..35a4e67e1a 100644 --- a/src/extensions/extension-loader/create-extension-instance/create-extension-instance.ts +++ b/src/extensions/extension-loader/create-extension-instance/create-extension-instance.ts @@ -8,12 +8,11 @@ import { LensExtensionDependencies, setLensExtensionDependencies, } from "../../lens-extension-set-dependencies"; -import type { LensExtensionUpdateChecker } from "../../lens-extension-update-checker"; export const createExtensionInstance = (dependencies: LensExtensionDependencies) => - (ExtensionClass: LensExtensionConstructor, extension: InstalledExtension, updateChecker?: LensExtensionUpdateChecker) => { - const instance = new ExtensionClass(extension, updateChecker); + (ExtensionClass: LensExtensionConstructor, extension: InstalledExtension) => { + const instance = new ExtensionClass(extension); instance[setLensExtensionDependencies](dependencies); diff --git a/src/extensions/extension-loader/extension-loader.ts b/src/extensions/extension-loader/extension-loader.ts index f9f3f9b33e..ae5ff03c0f 100644 --- a/src/extensions/extension-loader/extension-loader.ts +++ b/src/extensions/extension-loader/extension-loader.ts @@ -27,7 +27,7 @@ const logModule = "[EXTENSIONS-LOADER]"; interface Dependencies { updateExtensionsState: (extensionsState: Record) => void - createExtensionInstance: (ExtensionClass: LensExtensionConstructor, extension: InstalledExtension, updateChecker: LensExtensionUpdateChecker) => LensExtension, + createExtensionInstance: (ExtensionClass: LensExtensionConstructor, extension: InstalledExtension) => LensExtension, } export interface ExtensionLoading { @@ -354,8 +354,10 @@ export class ExtensionLoader { // const instance = new LensExtensionClass(extension, this.extensionUpdateChecker); const instance = this.dependencies.createExtensionInstance( LensExtensionClass, - extension, - this.extensionUpdateChecker, + { + ...extension, + updateChecker: this.extensionUpdateChecker + } ); this.instances.set(extId, instance); diff --git a/src/extensions/lens-extension.ts b/src/extensions/lens-extension.ts index a4d7015d02..f5984d1f24 100644 --- a/src/extensions/lens-extension.ts +++ b/src/extensions/lens-extension.ts @@ -45,7 +45,7 @@ export class LensExtension { [Disposers] = disposer(); - constructor({ id, manifest, manifestPath, isBundled }: InstalledExtension, updateChecker?: LensExtensionUpdateChecker) { + constructor({ id, manifest, manifestPath, isBundled, updateChecker }: InstalledExtension) { makeObservable(this); this.id = id; this.manifest = manifest; diff --git a/src/renderer/components/+extensions/extension-updater/bundled-extensions-updater.ts b/src/renderer/components/+extensions/extension-updater/bundled-extensions-updater.ts index 98621f9172..03c47efcea 100644 --- a/src/renderer/components/+extensions/extension-updater/bundled-extensions-updater.ts +++ b/src/renderer/components/+extensions/extension-updater/bundled-extensions-updater.ts @@ -22,8 +22,6 @@ export class BundledExtensionsUpdater extends ExtensionUpdater { this.dependencies.ipcRenderer.on(UpdateBundledExtension, async (event, extensionId: string) => { const extension = this.dependencies.extensions.find(extension => extension.id == extensionId); - console.log({extension}) - if (extension?.isBundled && extension?.availableUpdate) { try { await this.update(extension);