From 30a04f95cf1dc67fdc59c2b0d8532183d1839deb Mon Sep 17 00:00:00 2001 From: Aravind Shankar Date: Wed, 28 Nov 2018 17:25:01 +0530 Subject: [PATCH 1/2] console semver check fix for non-tag versions, fix #1133 --- console/package.json | 2 +- console/src/helpers/semver.js | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/console/package.json b/console/package.json index a5c5784728b28..489988cfdde43 100644 --- a/console/package.json +++ b/console/package.json @@ -94,7 +94,7 @@ "redux": "^4.0.0", "redux-logger": "^3.0.6", "redux-thunk": "^2.2.0", - "semver": "^5.3.0", + "semver": "5.5.0", "subscriptions-transport-ws": "^0.9.12", "uuid": "^3.0.1", "valid-url": "^1.0.9" diff --git a/console/src/helpers/semver.js b/console/src/helpers/semver.js index e7e18a65fd97e..63842d49bf013 100644 --- a/console/src/helpers/semver.js +++ b/console/src/helpers/semver.js @@ -33,14 +33,12 @@ const getPreRelease = version => { const semverCheck = (component, serverVersion) => { if (component in componentsSemver) { - const componentCoerce = semver.valid( - semver.coerce(componentsSemver[component]) - ); + const componentCoerce = semver.valid(componentsSemver[component]); if (componentCoerce == null) { return false; } - const serverCoerce = semver.valid(semver.coerce(serverVersion)); + const serverCoerce = semver.valid(serverVersion); if (serverCoerce == null) { return true; } From e5d56366bb3826ff220c8ecc325cbcee71e5f95b Mon Sep 17 00:00:00 2001 From: Aravind Shankar Date: Wed, 28 Nov 2018 17:51:49 +0530 Subject: [PATCH 2/2] bump semver package version --- console/package-lock.json | 4 ++-- console/package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/console/package-lock.json b/console/package-lock.json index 7fb01a2ed6d3b..040268a0dec7f 100644 --- a/console/package-lock.json +++ b/console/package-lock.json @@ -2140,7 +2140,7 @@ "dependencies": { "dotenv": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-2.0.0.tgz", + "resolved": "http://registry.npmjs.org/dotenv/-/dotenv-2.0.0.tgz", "integrity": "sha1-vXWcNXqqcDZeAclrewvsCKbg2Uk=", "dev": true } @@ -4352,7 +4352,7 @@ }, "load-json-file": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { diff --git a/console/package.json b/console/package.json index 489988cfdde43..fd22b83255767 100644 --- a/console/package.json +++ b/console/package.json @@ -94,7 +94,7 @@ "redux": "^4.0.0", "redux-logger": "^3.0.6", "redux-thunk": "^2.2.0", - "semver": "5.5.0", + "semver": "5.5.1", "subscriptions-transport-ws": "^0.9.12", "uuid": "^3.0.1", "valid-url": "^1.0.9"