From 8347937fc037604bd60b4f6a89352147551f73c0 Mon Sep 17 00:00:00 2001 From: Roman Date: Tue, 10 May 2022 19:38:02 +0300 Subject: [PATCH] allow to use `semver.parse` range format Signed-off-by: Roman --- src/extensions/__tests__/is-compatible-extension.test.ts | 2 +- .../is-compatible-extension/is-compatible-extension.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/extensions/__tests__/is-compatible-extension.test.ts b/src/extensions/__tests__/is-compatible-extension.test.ts index f1af499da0..2580b509dd 100644 --- a/src/extensions/__tests__/is-compatible-extension.test.ts +++ b/src/extensions/__tests__/is-compatible-extension.test.ts @@ -62,7 +62,7 @@ describe("Extension/App versions compatibility check", () => { it("is compatible with lensEngine with prerelease", () => { expect(isCompatibleExtension({ - appSemVer: semver.coerce("5.5.0-alpha.0"), + appSemVer: semver.parse("5.5.0-alpha.0"), })(getExtensionManifestMock({ lensEngine: "^5.4.0-alpha.0", }))).toBeTruthy(); diff --git a/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.ts b/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.ts index 0a6bed8bc2..de601ee339 100644 --- a/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.ts +++ b/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.ts @@ -11,7 +11,7 @@ interface Dependencies { export const isCompatibleExtension = ({ appSemVer }: Dependencies): ((manifest: LensExtensionManifest) => boolean) => { return (manifest: LensExtensionManifest): boolean => { - const { raw: appVersion } = appSemVer; + const appVersion = appSemVer.raw.split("-")[0]; // drop prerelease version if any, e.g. "-alpha.0" const manifestLensEngine = manifest.engines.lens; const validVersion = manifestLensEngine.match(/^[\^0-9]\d*\.\d+\b/); // must start from ^ or number