fix: 2.0.0-rc1 should never be included in ^1.0.0

Author: isaacs

CHANGELOG.md

@@ -1,5 +1,10 @@
 # changes log
 
+## 7.2.2
+
+* Fix bug where `2.0.0-pre` would be included in `^1.0.0` if
+  `includePrerelease` was set to true.
+
 ## 7.2.0
 
 * Add `simplifyRange` method to attempt to generate a more human-readable

classes/range.js

@@ -243,47 +243,48 @@ const replaceCarets = (comp, options) =>
 const replaceCaret = (comp, options) => {
   debug('caret', comp, options)
   const r = options.loose ? re[t.CARETLOOSE] : re[t.CARET]
+  const z = options.includePrerelease ? '-0' : ''
   return comp.replace(r, (_, M, m, p, pr) => {
     debug('caret', comp, _, M, m, p, pr)
     let ret
 
     if (isX(M)) {
       ret = ''
     } else if (isX(m)) {
-      ret = `>=${M}.0.0 <${+M + 1}.0.0`
+      ret = `>=${M}.0.0${z} <${+M + 1}.0.0${z}`
     } else if (isX(p)) {
       if (M === '0') {
-        ret = `>=${M}.${m}.0 <${M}.${+m + 1}.0`
+        ret = `>=${M}.${m}.0${z} <${M}.${+m + 1}.0${z}`
       } else {
-        ret = `>=${M}.${m}.0 <${+M + 1}.0.0`
+        ret = `>=${M}.${m}.0${z} <${+M + 1}.0.0${z}`
       }
     } else if (pr) {
       debug('replaceCaret pr', pr)
       if (M === '0') {
         if (m === '0') {
           ret = `>=${M}.${m}.${p}-${pr
-          } <${M}.${m}.${+p + 1}`
+          } <${M}.${m}.${+p + 1}${z}`
         } else {
           ret = `>=${M}.${m}.${p}-${pr
-          } <${M}.${+m + 1}.0`
+          } <${M}.${+m + 1}.0${z}`
         }
       } else {
         ret = `>=${M}.${m}.${p}-${pr
-        } <${+M + 1}.0.0`
+        } <${+M + 1}.0.0${z}`
       }
     } else {
       debug('no pr')
       if (M === '0') {
         if (m === '0') {
           ret = `>=${M}.${m}.${p
-          } <${M}.${m}.${+p + 1}`
+          }${z} <${M}.${m}.${+p + 1}${z}`
         } else {
           ret = `>=${M}.${m}.${p
-          } <${M}.${+m + 1}.0`
+          }${z} <${M}.${+m + 1}.0${z}`
         }
       } else {
         ret = `>=${M}.${m}.${p
-        } <${+M + 1}.0.0`
+        } <${+M + 1}.0.0${z}`
       }
     }
 

test/fixtures/range-exclude.js

@@ -78,4 +78,6 @@ module.exports = [
   ['2.x', '3.0.0-pre.0', { includePrerelease: true }],
   ['^1.0.0', '1.0.0-rc1', { includePrerelease: true }],
   ['^1.2.3-rc2', '2.0.0', { includePrerelease: true }],
+  ['^1.0.0', '2.0.0-rc1', { includePrerelease: true }],
+  ['^1.0.0', '2.0.0-rc1'],
 ]

test/fixtures/range-include.js

@@ -110,7 +110,6 @@ module.exports = [
   ['2.x', '2.0.0-pre.0', { includePrerelease: true }],
   ['2.x', '2.1.0-pre.0', { includePrerelease: true }],
   ['*', '1.0.0-rc1', { includePrerelease: true }],
-  ['^1.0.0', '2.0.0-rc1', { includePrerelease: true }],
   ['^1.0.0-0', '1.0.1-rc1', { includePrerelease: true }],
   ['^1.0.0-rc2', '1.0.1-rc1', { includePrerelease: true }],
   ['^1.0.0', '1.0.1-rc1', { includePrerelease: true }],