Fix bug with debug output and unreleased versions

This commit is contained in:
Brian Ng 2017-12-19 10:50:01 -06:00
parent 44da8201a5
commit cd10ea03b4
No known key found for this signature in database
GPG Key ID: 3F2380E1E1508CA9
2 changed files with 18 additions and 4 deletions

View File

@ -1,6 +1,6 @@
/*eslint quotes: ["error", "double", { "avoidEscape": true }]*/
import semver from "semver";
import { prettifyVersion, semverify } from "./utils";
import { isUnreleasedVersion, prettifyVersion, semverify } from "./utils";
const wordEnds = size => {
return size > 1 ? "s" : "";
@ -15,9 +15,23 @@ export const logMessage = (message, context) => {
export const logPlugin = (plugin, targets, list, context) => {
const envList = list[plugin] || {};
const filteredList = Object.keys(targets).reduce((a, b) => {
if (!envList[b] || semver.lt(targets[b], semverify(envList[b]))) {
a[b] = prettifyVersion(targets[b]);
const version = envList[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;
}, {});

View File

@ -58,7 +58,7 @@ export const prettifyTargets = (targets: Targets): Object => {
export const isUnreleasedVersion = (version: string, env: string): boolean => {
const unreleasedLabel = unreleasedLabels[env];
return (
unreleasedLabel && unreleasedLabel === version.toString().toLowerCase()
!!unreleasedLabel && unreleasedLabel === version.toString().toLowerCase()
);
};