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 problem with in-tree extension load (#3274)

Browse Source 
* Revert "don't set prerelease version info when non-prerelease (#3261)"

This reverts commit 3f01abbddf.

* include fix from #3256

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen 2021-07-05 23:17:35 +03:00 committed by GitHub
parent 3138307895
commit e60c6905da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/set_build_version.ts
View File

@ -32,6 +32,8 @@ function getBuildChannel(): string {
switch (versionInfo.prerelease?.[0]) {
case "beta":
return "beta";
case undefined:
return "latest";
default:
return "alpha";
}
@ -57,16 +59,16 @@ async function writeOutNewVersions() {
}
function main() {
if (versionInfo.prerelease && versionInfo.prerelease.length > 1) {
const prereleaseParts: string[] = [getBuildChannel()];
if (versionInfo.prerelease && versionInfo.prerelease.length > 1) {
prereleaseParts.push(versionInfo.prerelease[1].toString());
prereleaseParts.push(buildNumber);
appInfo.version = `${versionInfo.major}.${versionInfo.minor}.${versionInfo.patch}-${prereleaseParts.join(".")}`;
} else {
appInfo.version = `${versionInfo.major}.${versionInfo.minor}.${versionInfo.patch}+${buildNumber}`;
}
prereleaseParts.push(buildNumber);
appInfo.version = `${versionInfo.major}.${versionInfo.minor}.${versionInfo.patch}-${prereleaseParts.join(".")}`;
writeOutNewVersions()
.catch((error) => {
console.error(error);

8
src/extensions/extension-discovery.ts
View File

@ -365,7 +365,13 @@ export class ExtensionDiscovery extends Singleton {
let isCompatible = isBundled;
if (manifest.engines?.lens) {
isCompatible = semver.satisfies(appSemVer, manifest.engines.lens);
const appSemVerLatestImplied = appSemVer;
if (appSemVerLatestImplied.prerelease?.[0] === "latest") {
/* remove the "latest" prerelease tag so as not to require the extension to specify it */
appSemVerLatestImplied.prerelease = [];
}
isCompatible = semver.satisfies(appSemVerLatestImplied, manifest.engines.lens);
}
return {