Skip to content
Permalink
Browse files
fix: adapt for semver to version 7.3.2 (part II) (#1530)
  • Loading branch information
gr2m committed Apr 16, 2020
1 parent 0363790 commit 431d571a7b7284b2029a55da68a44c65d7c16451
Showing with 18 additions and 15 deletions.
  1. +7 −4 lib/utils.js
  2. +11 −11 test/utils.test.js
@@ -31,11 +31,14 @@ function isMaintenanceRange(range) {
}

function getUpperBound(range) {
return semver.valid(range)
const result = semver.valid(range)
? range
: ((semver.validRange(range) || '').match(/<(?<upperBound>\d+\.\d+\.\d+-\d+)$/) || [])[1]
// https://github.com/npm/node-semver/issues/322
.replace(/-\d+$/, '');
: ((semver.validRange(range) || '').match(/<(?<upperBound>\d+\.\d+\.\d+(-\d+)?)$/) || [])[1];

return result
? // https://github.com/npm/node-semver/issues/322
result.replace(/-\d+$/, '')
: result;
}

function getLowerBound(range) {
@@ -71,17 +71,17 @@ test('isMaintenanceRange', (t) => {

test('getUpperBound', (t) => {
t.is(getUpperBound('1.x.x'), '2.0.0');
// T.is(getUpperBound('1.X.X'), '2.0.0');
// t.is(getUpperBound('10.x.x'), '11.0.0');
// t.is(getUpperBound('1.x'), '2.0.0');
// t.is(getUpperBound('10.x'), '11.0.0');
// t.is(getUpperBound('1.0.x'), '1.1.0');
// t.is(getUpperBound('10.0.x'), '10.1.0');
// t.is(getUpperBound('10.10.x'), '10.11.0');
// t.is(getUpperBound('1.0.0'), '1.0.0');
// t.is(getUpperBound('10.0.0'), '10.0.0');

// t.is(getUpperBound('foo'), undefined);
t.is(getUpperBound('1.X.X'), '2.0.0');
t.is(getUpperBound('10.x.x'), '11.0.0');
t.is(getUpperBound('1.x'), '2.0.0');
t.is(getUpperBound('10.x'), '11.0.0');
t.is(getUpperBound('1.0.x'), '1.1.0');
t.is(getUpperBound('10.0.x'), '10.1.0');
t.is(getUpperBound('10.10.x'), '10.11.0');
t.is(getUpperBound('1.0.0'), '1.0.0');
t.is(getUpperBound('10.0.0'), '10.0.0');

t.is(getUpperBound('foo'), undefined);
});

test('getLowerBound', (t) => {

0 comments on commit 431d571

Please sign in to comment.