diff --git a/src/extensions/__tests__/extension-discovery.test.ts b/src/extensions/__tests__/extension-discovery.test.ts index 5b262d3833..347487e556 100644 --- a/src/extensions/__tests__/extension-discovery.test.ts +++ b/src/extensions/__tests__/extension-discovery.test.ts @@ -93,7 +93,7 @@ describe("ExtensionDiscovery", () => { id: path.normalize("node_modules/my-extension/package.json"), isBundled: false, isEnabled: false, - isValid: false, + isCompatible: false, manifest: { name: "my-extension", }, diff --git a/src/extensions/__tests__/lens-extension.test.ts b/src/extensions/__tests__/lens-extension.test.ts index c415c1c37a..c9c52d1637 100644 --- a/src/extensions/__tests__/lens-extension.test.ts +++ b/src/extensions/__tests__/lens-extension.test.ts @@ -39,7 +39,7 @@ describe("lens extension", () => { manifestPath: "/this/is/fake/package.json", isBundled: false, isEnabled: true, - isValid: true + isCompatible: true }); }); diff --git a/src/extensions/extension-discovery.ts b/src/extensions/extension-discovery.ts index 851630f5e7..a791da462a 100644 --- a/src/extensions/extension-discovery.ts +++ b/src/extensions/extension-discovery.ts @@ -51,7 +51,7 @@ export interface InstalledExtension { // Absolute to the symlinked package.json file readonly manifestPath: string; readonly isBundled: boolean; // defined in project root's package.json - readonly isValid: boolean; + readonly isCompatible: boolean; isEnabled: boolean; } @@ -359,10 +359,10 @@ export class ExtensionDiscovery extends Singleton { const extensionDir = path.dirname(manifestPath); const npmPackage = path.join(extensionDir, `${manifest.name}-${manifest.version}.tgz`); const absolutePath = (isProduction && await fse.pathExists(npmPackage)) ? npmPackage : extensionDir; - let isValid = false; + let isCompatible = false; if (manifest.engines?.lens) { - isValid = semver.satisfies(appSemVer, manifest.engines.lens); + isCompatible = semver.satisfies(appSemVer, manifest.engines.lens); } return { @@ -372,7 +372,7 @@ export class ExtensionDiscovery extends Singleton { manifest, isBundled, isEnabled, - isValid + isCompatible }; } catch (error) { if (error.code === "ENOTDIR") { diff --git a/src/extensions/extension-loader.ts b/src/extensions/extension-loader.ts index 24cbfa1474..ebf2a5da3e 100644 --- a/src/extensions/extension-loader.ts +++ b/src/extensions/extension-loader.ts @@ -299,7 +299,7 @@ export class ExtensionLoader extends Singleton { for (const [extId, extension] of installedExtensions) { const alreadyInit = this.instances.has(extId); - if (extension.isValid && extension.isEnabled && !alreadyInit) { + if (extension.isCompatible && extension.isEnabled && !alreadyInit) { try { const LensExtensionClass = this.requireExtension(extension); diff --git a/src/extensions/registries/__tests__/page-registry.test.ts b/src/extensions/registries/__tests__/page-registry.test.ts index 78a7bbe1da..497d92e723 100644 --- a/src/extensions/registries/__tests__/page-registry.test.ts +++ b/src/extensions/registries/__tests__/page-registry.test.ts @@ -41,7 +41,7 @@ describe("getPageUrl", () => { manifestPath: "/this/is/fake/package.json", isBundled: false, isEnabled: true, - isValid: true + isCompatible: true }); globalPageRegistry.add({ id: "page-with-params", @@ -109,7 +109,7 @@ describe("globalPageRegistry", () => { manifestPath: "/this/is/fake/package.json", isBundled: false, isEnabled: true, - isValid: true + isCompatible: true }); globalPageRegistry.add([ { diff --git a/src/main/protocol-handler/__test__/router.test.ts b/src/main/protocol-handler/__test__/router.test.ts index 717b8afb4e..284b328ff7 100644 --- a/src/main/protocol-handler/__test__/router.test.ts +++ b/src/main/protocol-handler/__test__/router.test.ts @@ -87,7 +87,7 @@ describe("protocol router tests", () => { }, isBundled: false, isEnabled: true, - isValid: true, + isCompatible: true, absolutePath: "/foo/bar", }); const lpr = LensProtocolRouterMain.getInstance(); @@ -165,7 +165,7 @@ describe("protocol router tests", () => { }, isBundled: false, isEnabled: true, - isValid: true, + isCompatible: true, absolutePath: "/foo/bar", }); @@ -206,7 +206,7 @@ describe("protocol router tests", () => { }, isBundled: false, isEnabled: true, - isValid: true, + isCompatible: true, absolutePath: "/foo/bar", }); @@ -231,7 +231,7 @@ describe("protocol router tests", () => { }, isBundled: false, isEnabled: true, - isValid: true, + isCompatible: true, absolutePath: "/foo/bar", }); diff --git a/src/renderer/components/+extensions/__tests__/extensions.test.tsx b/src/renderer/components/+extensions/__tests__/extensions.test.tsx index a39fa416e9..3361362b4b 100644 --- a/src/renderer/components/+extensions/__tests__/extensions.test.tsx +++ b/src/renderer/components/+extensions/__tests__/extensions.test.tsx @@ -77,7 +77,7 @@ describe("Extensions", () => { manifestPath: "/symlinked/path/package.json", isBundled: false, isEnabled: true, - isValid: true + isCompatible: true }); }); diff --git a/src/renderer/components/+extensions/installed-extensions.tsx b/src/renderer/components/+extensions/installed-extensions.tsx index b336e7160a..0da09e5ec9 100644 --- a/src/renderer/components/+extensions/installed-extensions.tsx +++ b/src/renderer/components/+extensions/installed-extensions.tsx @@ -40,7 +40,7 @@ interface Props { } function getStatus(extension: InstalledExtension) { - if (!extension.isValid) { + if (!extension.isCompatible) { return "Incompatible"; } @@ -91,7 +91,7 @@ export const InstalledExtensions = observer(({ extensions, uninstall, enable, di const data = useMemo( () => { return extensions.map(extension => { - const { id, isEnabled, isValid, manifest } = extension; + const { id, isEnabled, isCompatible, manifest } = extension; const { name, description, version } = manifest; const isUninstalling = ExtensionInstallationStateStore.isExtensionUninstalling(id); @@ -106,13 +106,13 @@ export const InstalledExtensions = observer(({ extensions, uninstall, enable, di ), version, status: ( -