diff options
Diffstat (limited to 'tools/node_modules/eslint/node_modules/semver/ranges')
-rw-r--r-- | tools/node_modules/eslint/node_modules/semver/ranges/intersects.js | 2 | ||||
-rw-r--r-- | tools/node_modules/eslint/node_modules/semver/ranges/subset.js | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tools/node_modules/eslint/node_modules/semver/ranges/intersects.js b/tools/node_modules/eslint/node_modules/semver/ranges/intersects.js index 3d1a6f31df..e0e9b7ce00 100644 --- a/tools/node_modules/eslint/node_modules/semver/ranges/intersects.js +++ b/tools/node_modules/eslint/node_modules/semver/ranges/intersects.js @@ -2,6 +2,6 @@ const Range = require('../classes/range') const intersects = (r1, r2, options) => { r1 = new Range(r1, options) r2 = new Range(r2, options) - return r1.intersects(r2) + return r1.intersects(r2, options) } module.exports = intersects diff --git a/tools/node_modules/eslint/node_modules/semver/ranges/subset.js b/tools/node_modules/eslint/node_modules/semver/ranges/subset.js index e0dea43c2b..1e5c26837c 100644 --- a/tools/node_modules/eslint/node_modules/semver/ranges/subset.js +++ b/tools/node_modules/eslint/node_modules/semver/ranges/subset.js @@ -68,6 +68,9 @@ const subset = (sub, dom, options = {}) => { return true } +const minimumVersionWithPreRelease = [new Comparator('>=0.0.0-0')] +const minimumVersion = [new Comparator('>=0.0.0')] + const simpleSubset = (sub, dom, options) => { if (sub === dom) { return true @@ -77,9 +80,9 @@ const simpleSubset = (sub, dom, options) => { if (dom.length === 1 && dom[0].semver === ANY) { return true } else if (options.includePrerelease) { - sub = [new Comparator('>=0.0.0-0')] + sub = minimumVersionWithPreRelease } else { - sub = [new Comparator('>=0.0.0')] + sub = minimumVersion } } @@ -87,7 +90,7 @@ const simpleSubset = (sub, dom, options) => { if (options.includePrerelease) { return true } else { - dom = [new Comparator('>=0.0.0')] + dom = minimumVersion } } |