Fix bug with debug output and unreleased versions
This commit is contained in:
parent
44da8201a5
commit
cd10ea03b4
@ -1,6 +1,6 @@
|
|||||||
/*eslint quotes: ["error", "double", { "avoidEscape": true }]*/
|
/*eslint quotes: ["error", "double", { "avoidEscape": true }]*/
|
||||||
import semver from "semver";
|
import semver from "semver";
|
||||||
import { prettifyVersion, semverify } from "./utils";
|
import { isUnreleasedVersion, prettifyVersion, semverify } from "./utils";
|
||||||
|
|
||||||
const wordEnds = size => {
|
const wordEnds = size => {
|
||||||
return size > 1 ? "s" : "";
|
return size > 1 ? "s" : "";
|
||||||
@ -15,9 +15,23 @@ export const logMessage = (message, context) => {
|
|||||||
export const logPlugin = (plugin, targets, list, context) => {
|
export const logPlugin = (plugin, targets, list, context) => {
|
||||||
const envList = list[plugin] || {};
|
const envList = list[plugin] || {};
|
||||||
const filteredList = Object.keys(targets).reduce((a, b) => {
|
const filteredList = Object.keys(targets).reduce((a, b) => {
|
||||||
if (!envList[b] || semver.lt(targets[b], semverify(envList[b]))) {
|
const version = envList[b];
|
||||||
a[b] = prettifyVersion(targets[b]);
|
const target = targets[b];
|
||||||
|
|
||||||
|
if (!version) {
|
||||||
|
a[b] = prettifyVersion(target);
|
||||||
|
} else {
|
||||||
|
const versionIsUnreleased = isUnreleasedVersion(version, b);
|
||||||
|
const targetIsUnreleased = isUnreleasedVersion(target, b);
|
||||||
|
|
||||||
|
if (
|
||||||
|
(versionIsUnreleased && !targetIsUnreleased) ||
|
||||||
|
(!targetIsUnreleased && semver.lt(target, semverify(version)))
|
||||||
|
) {
|
||||||
|
a[b] = prettifyVersion(target);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return a;
|
return a;
|
||||||
}, {});
|
}, {});
|
||||||
|
|
||||||
|
|||||||
@ -58,7 +58,7 @@ export const prettifyTargets = (targets: Targets): Object => {
|
|||||||
export const isUnreleasedVersion = (version: string, env: string): boolean => {
|
export const isUnreleasedVersion = (version: string, env: string): boolean => {
|
||||||
const unreleasedLabel = unreleasedLabels[env];
|
const unreleasedLabel = unreleasedLabels[env];
|
||||||
return (
|
return (
|
||||||
unreleasedLabel && unreleasedLabel === version.toString().toLowerCase()
|
!!unreleasedLabel && unreleasedLabel === version.toString().toLowerCase()
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user