mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Fix issues when using newer @types/semver (#6132)
- All the removed uses of `includePrerelease` that are removed were not actually used within the semver package Signed-off-by: Sebastian Malton <sebastian@malton.name> Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
parent
642300c71f
commit
7767216167
@ -81,7 +81,7 @@ export function sortCharts(charts: RawHelmChart[]) {
|
|||||||
iter.map(
|
iter.map(
|
||||||
charts,
|
charts,
|
||||||
chart => {
|
chart => {
|
||||||
const __version = coerce(chart.version, { includePrerelease: true, loose: true });
|
const __version = coerce(chart.version, { loose: true });
|
||||||
|
|
||||||
if (!__version) {
|
if (!__version) {
|
||||||
logger.warn(`[HELM-SERVICE]: Version from helm chart is not loosely coercable to semver.`, { name: chart.name, version: chart.version, repo: chart.repo });
|
logger.warn(`[HELM-SERVICE]: Version from helm chart is not loosely coercable to semver.`, { name: chart.name, version: chart.version, repo: chart.repo });
|
||||||
|
|||||||
@ -27,7 +27,6 @@ export const isCompatibleExtension = ({ appSemVer }: Dependencies): ((manifest:
|
|||||||
|
|
||||||
const { major: extMajor, minor: extMinor } = semver.coerce(manifestLensEngine, {
|
const { major: extMajor, minor: extMinor } = semver.coerce(manifestLensEngine, {
|
||||||
loose: true,
|
loose: true,
|
||||||
includePrerelease: false,
|
|
||||||
}) as semver.SemVer;
|
}) as semver.SemVer;
|
||||||
const supportedVersionsByExtension = semver.validRange(`^${extMajor}.${extMinor}`) as string;
|
const supportedVersionsByExtension = semver.validRange(`^${extMajor}.${extMinor}`) as string;
|
||||||
|
|
||||||
|
|||||||
@ -67,7 +67,7 @@ export class Kubectl {
|
|||||||
let version: SemVer;
|
let version: SemVer;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
version = new SemVer(clusterVersion, { includePrerelease: false });
|
version = new SemVer(clusterVersion);
|
||||||
} catch {
|
} catch {
|
||||||
version = new SemVer(Kubectl.bundledKubectlVersion);
|
version = new SemVer(Kubectl.bundledKubectlVersion);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -91,7 +91,7 @@ const attemptInstallByInfo = ({
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
const versions = Object.keys(json.versions)
|
const versions = Object.keys(json.versions)
|
||||||
.map(version => new SemVer(version, { loose: true, includePrerelease: true }))
|
.map(version => new SemVer(version, { loose: true }))
|
||||||
// ignore pre-releases for auto picking the version
|
// ignore pre-releases for auto picking the version
|
||||||
.filter(version => version.prerelease.length === 0);
|
.filter(version => version.prerelease.length === 0);
|
||||||
|
|
||||||
|
|||||||
@ -55,7 +55,7 @@ export class HelmChartStore extends ItemStore<HelmChart> {
|
|||||||
|
|
||||||
protected sortVersions = (versions: ChartVersion[]) => {
|
protected sortVersions = (versions: ChartVersion[]) => {
|
||||||
return versions
|
return versions
|
||||||
.map(chartVersion => ({ ...chartVersion, __version: semver.coerce(chartVersion.version, { includePrerelease: true, loose: true }) }))
|
.map(chartVersion => ({ ...chartVersion, __version: semver.coerce(chartVersion.version, { loose: true }) }))
|
||||||
.sort(sortCompareChartVersions)
|
.sort(sortCompareChartVersions)
|
||||||
.map(({ __version, ...chartVersion }) => chartVersion);
|
.map(({ __version, ...chartVersion }) => chartVersion);
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user