browserslist 4.8.5 → 4.9.1

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.9.1
+* Normalize incorrect Can I Use regional data (by Huáng Jùnliàng).
+
+## 4.9
+* Add `node X-Y` query support (by Yuping Zuo).
+
+## 4.8.7
+* Fix `last N major versions` (by Valeriy Trubachev).
+
+## 4.8.6
+* Fix `Unknown version 10 of op_mob` error in `mobileToDesktop` option.
+
 ## 4.8.5
 * Fix `last N browsers` again after new `caniuse-db` API changes.
 

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright 2014 Andrey Sitnik <andrey@sitnik.ru>
+Copyright 2014 Andrey Sitnik <andrey@sitnik.ru> and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

package/README.md

@@ -37,7 +37,7 @@ not IE_Mob 11
 maintained node versions
 ```
 
-Developers set versions list in queries like `last 2 version`
+Developers set their version lists using queries like `last 2 version`
 to be free from updating versions manually.
 Browserslist will use [`caniuse-lite`] with [Can I Use] data for this queries.
 
@@ -91,12 +91,14 @@ Browserslist will take queries from tool option,
   by user agent string to match Browserslist.
 * [`browserslist-browserstack`] runs BrowserStack tests for all browsers
   in Browserslist config.
+* [`browserslist-adobe-analytics`] use Adobe Analytics data to target browsers.
 * [`caniuse-api`] returns browsers which support some specific feature.
 * Run `npx browserslist` in your project directory to see project’s
   target browsers. This CLI tool is built-in and available in any project
   with Autoprefixer.
 
 [`browserslist-useragent-regexp`]: https://github.com/browserslist/browserslist-useragent-regexp
+[`browserslist-adobe-analytics`]:  https://github.com/xeroxinteractive/browserslist-adobe-analytics
 [`browserslist-useragent-ruby`]:   https://github.com/browserslist/browserslist-useragent-ruby
 [`browserslist-browserstack`]:     https://github.com/xeroxinteractive/browserslist-browserstack
 [`browserslist-ga-export`]:        https://github.com/browserslist/browserslist-ga-export
@@ -116,9 +118,9 @@ Browserslist will take queries from tool option,
     ]
   ```
 
-* If you want to change the default set of browsers we recommend to combine
+* If you want to change the default set of browsers, we recommend combining
   `last 2 versions`, `not dead` with a usage number like `> 0.2%`. This is
-  because `last n versions` on its own does not add popular old versions while
+  because `last n versions` on its own does not add popular old versions, while
   only using a percentage above `0.2%` will in the long run make popular
   browsers even more popular. We might run into a monopoly and stagnation
   situation, as we had with Internet Explorer 6. Please use this setting
@@ -537,8 +539,8 @@ These browsers account for 83.1% of all users in custom statistics
 
 ## Environment Variables
 
-If some tool use Browserslist inside, you can change browsers settings
-by [environment variables]:
+If a tool uses Browserslist inside, you can change the Browserslist settings
+with [environment variables]:
 
 * `BROWSERSLIST` with browsers queries.
 

package/index.js

@@ -53,7 +53,11 @@ function getMajor (version) {
 
 function getMajorVersions (released, number) {
   if (released.length === 0) return []
-  var minimum = getMajor(released[released.length - 1]) - parseInt(number) + 1
+  var majorVersions = uniq(released.map(getMajor))
+  var minimum = majorVersions[majorVersions.length - number]
+  if (!minimum) {
+    return released
+  }
   var selected = []
   for (var i = released.length - 1; i >= 0; i--) {
     if (minimum > getMajor(released[i])) break
@@ -144,6 +148,43 @@ function compareSemver (a, b) {
   )
 }
 
+// this follows the npm-like semver behavior
+function semverFilterLoose (operator, range) {
+  range = range.split('.').map(parseSimpleInt)
+  if (typeof range[1] === 'undefined') {
+    range[1] = 'x'
+  }
+  // ignore any patch version because we only return minor versions
+  // range[2] = 'x'
+  switch (operator) {
+    case '<=':
+      return function (version) {
+        version = version.split('.').map(parseSimpleInt)
+        return compareSemverLoose(version, range) <= 0
+      }
+    default:
+    case '>=':
+      return function (version) {
+        version = version.split('.').map(parseSimpleInt)
+        return compareSemverLoose(version, range) >= 0
+      }
+  }
+}
+
+// this follows the npm-like semver behavior
+function compareSemverLoose (version, range) {
+  if (version[0] !== range[0]) {
+    return version[0] < range[0] ? -1 : +1
+  }
+  if (range[1] === 'x') {
+    return 0
+  }
+  if (version[1] !== range[1]) {
+    return version[1] < range[1] ? -1 : +1
+  }
+  return 0
+}
+
 function resolveVersion (data, version) {
   if (data.versions.indexOf(version) !== -1) {
     return version
@@ -186,6 +227,21 @@ function cloneData (data) {
   }
 }
 
+function mapVersions (data, map) {
+  data.versions = data.versions.map(function (i) {
+    return map[i] || i
+  })
+  data.released = data.versions.map(function (i) {
+    return map[i] || i
+  })
+  var fixedDate = { }
+  for (var i in data.releaseDate) {
+    fixedDate[map[i] || i] = data.releaseDate[i]
+  }
+  data.releaseDate = fixedDate
+  return data
+}
+
 function byName (name, context) {
   name = name.toLowerCase()
   name = browserslist.aliases[name] || name
@@ -196,6 +252,9 @@ function byName (name, context) {
     } else {
       var cloned = cloneData(desktop)
       cloned.name = name
+      if (name === 'op_mob') {
+        cloned = mapVersions(cloned, { '10.0-10.1': '10' })
+      }
       return cloned
     }
   }
@@ -529,7 +588,7 @@ browserslist.coverage = function (browsers, stats) {
     } else {
       stats = stats.toUpperCase()
     }
-    env.loadCountry(browserslist.usage, stats)
+    env.loadCountry(browserslist.usage, stats, browserslist.data)
     data = browserslist.usage[stats]
   } else {
     if ('dataByBrowser' in stats) {
@@ -764,7 +823,7 @@ var QUERIES = [
       } else {
         place = place.toLowerCase()
       }
-      env.loadCountry(browserslist.usage, place)
+      env.loadCountry(browserslist.usage, place, browserslist.data)
       var usage = browserslist.usage[place]
       return Object.keys(usage).reduce(function (result, version) {
         if (sign === '>') {
@@ -807,7 +866,7 @@ var QUERIES = [
           } else {
             place = place.toLowerCase()
           }
-          env.loadCountry(browserslist.usage, place)
+          env.loadCountry(browserslist.usage, place, browserslist.data)
           usage = browserslist.usage[place]
         }
       }
@@ -848,6 +907,31 @@ var QUERIES = [
       })
     }
   },
+  {
+    regexp: /^node\s+([\d.]+)\s*-\s*([\d.]+)$/i,
+    select: function (context, from, to) {
+      var nodeVersions = jsReleases.filter(function (i) {
+        return i.name === 'nodejs'
+      }).map(function (i) {
+        return i.version
+      })
+      var semverRegExp = /^(0|[1-9]\d*)(\.(0|[1-9]\d*)){0,2}$/
+      if (!semverRegExp.test(from)) {
+        throw new BrowserslistError(
+          'Unknown version ' + from + ' of Node.js')
+      }
+      if (!semverRegExp.test(to)) {
+        throw new BrowserslistError(
+          'Unknown version ' + to + ' of Node.js')
+      }
+      return nodeVersions
+        .filter(semverFilterLoose('>=', from))
+        .filter(semverFilterLoose('<=', to))
+        .map(function (v) {
+          return 'node ' + v
+        })
+    }
+  },
   {
     regexp: /^(\w+)\s+([\d.]+)\s*-\s*([\d.]+)$/i,
     select: function (context, name, from, to) {

package/node.js

@@ -137,6 +137,20 @@ function normalizeStats (data, stats) {
   return normalized
 }
 
+function normalizeUsageData (usageData, data) {
+  for (var browser in usageData) {
+    var browserUsage = usageData[browser]
+    // eslint-disable-next-line max-len
+    // https://github.com/browserslist/browserslist/issues/431#issuecomment-565230615
+    // caniuse-db returns { 0: "percentage" } for `and_*` regional stats
+    if ('0' in browserUsage) {
+      var versions = data[browser].versions
+      browserUsage[versions[versions.length - 1]] = browserUsage[0]
+      delete browserUsage[0]
+    }
+  }
+}
+
 module.exports = {
   loadQueries: function loadQueries (context, name) {
     if (!context.dangerousExtend) checkExtend(name)
@@ -201,16 +215,17 @@ module.exports = {
     }
   },
 
-  loadCountry: function loadCountry (usage, country) {
+  loadCountry: function loadCountry (usage, country, data) {
     var code = country.replace(/[^\w-]/g, '')
     if (!usage[code]) {
       // eslint-disable-next-line security/detect-non-literal-require
       var compressed = require('caniuse-lite/data/regions/' + code + '.js')
-      var data = region(compressed)
+      var usageData = region(compressed)
+      normalizeUsageData(usageData, data)
       usage[country] = { }
-      for (var i in data) {
-        for (var j in data[i]) {
-          usage[country][i + ' ' + j] = data[i][j]
+      for (var i in usageData) {
+        for (var j in usageData[i]) {
+          usage[country][i + ' ' + j] = usageData[i][j]
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.8.5",
+  "version": "4.9.1",
   "description": "Share target browsers between different front-end tools, like Autoprefixer, Stylelint and babel-env-preset",
   "keywords": [
     "caniuse",
@@ -15,9 +15,9 @@
   "license": "MIT",
   "repository": "browserslist/browserslist",
   "dependencies": {
-    "caniuse-lite": "^1.0.30001022",
-    "electron-to-chromium": "^1.3.338",
-    "node-releases": "^1.1.46"
+    "caniuse-lite": "^1.0.30001030",
+    "electron-to-chromium": "^1.3.363",
+    "node-releases": "^1.1.50"
   },
   "bin": "./cli.js",
   "browser": {
@@ -26,9 +26,5 @@
   },
   "eslintIgnore": [
     "test/fixtures"
-  ],
-  "sharec": {
-    "config": "@logux/sharec-config",
-    "version": "0.5.6"
-  }
+  ]
 }