browserslist 2.3.0 → 2.4.0

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.4
+* Add `last n major versions` query (by John Sanders).
+
+## 2.3.3
+* Fix browsers support.
+
+## 2.3.2
+* Fix `> 0` query for browsers with one version (by Nikolay Solovyov).
+
+## 2.3.1
+* Reduce library size.
+
 ## 2.3
 * Add `unreleased versions` and `unreleased Chrome versions` queries.
 

package/README.md

@@ -79,6 +79,10 @@ You can specify the versions by queries (case insensitive):
 
 * `last 2 versions`: the last 2 versions for each browser.
 * `last 2 Chrome versions`: the last 2 versions of Chrome browser.
+* `last 2 major versions`: all minor/patch releases of the current
+  and previous major versions.
+* `last 2 iOS major versions`: all minor/patch releases of the current
+  and previous major versions of iOS Safari.
 * `> 5%` or `>= 5%`: versions selected by global usage statistics.
 * `> 5% in US`: uses USA usage statistics. It accepts [two-letter country code].
 * `> 5% in alt-AS`: uses Asia region usage statistics. List of all region codes
@@ -293,6 +297,26 @@ For example, the query `> 1% in my stats, > 5% in US, 10%` is permitted.
 
 [Can I Use]: http://caniuse.com/
 
+## Webpack
+
+If you plan to use Browserslist on client-side (e. g., tools like CodePen)
+Browserslist could take big part of your bundle — about 150 KB.
+
+But the biggest part of this size will be region usage statistics, which could
+be useless for you. You can use `IgnorePlugin` in webpack to cut it:
+
+```js
+const webpackConfig = {
+  …
+  plugins: [
+    new webpack.IgnorePlugin(/caniuse-lite\/data\/regions/)
+  ]
+}
+```
+
+This plugin will reduce Browserslist size from 150 KB to 6 KB. But you loose
+`> 1% in US` queries support.
+
 ## JS API
 
 ```js

package/index.js

@@ -2,8 +2,8 @@ var path = require('path')
 var e2c = require('electron-to-chromium/versions')
 var fs = require('fs')
 
-var caniuse = require('caniuse-lite').agents
-var region = require('caniuse-lite').region
+var agents = require('caniuse-lite/dist/unpacker/agents').agents
+var region = require('caniuse-lite/dist/unpacker/region').default
 
 function normalize (versions) {
   return versions.filter(function (version) {
@@ -11,6 +11,29 @@ function normalize (versions) {
   })
 }
 
+function nameMapper (name) {
+  return function mapName (version) {
+    return name + ' ' + version
+  }
+}
+
+function getMajor (version) {
+  return parseInt(version.split('.')[0])
+}
+
+function getMajorVersions (released, number) {
+  if (released.length === 0) return []
+  var minimum = getMajor(released[released.length - 1]) - parseInt(number) + 1
+  var selected = []
+  for (var i = released.length - 1; i >= 0; i--) {
+    if (minimum > getMajor(released[i])) break
+    selected.unshift(released[i])
+  }
+  return selected
+}
+
+var env = process.env
+
 // eslint-disable-next-line security/detect-unsafe-regex
 var FLOAT_RANGE = /^\d+(\.\d+)?(-\d+(\.\d+)?)*$/
 var IS_SECTION = /^\s*\[(.+)\]\s*$/
@@ -41,16 +64,11 @@ function fillUsage (result, name, data) {
   }
 }
 
-var cacheEnabled = !(
-  process && process.env && process.env.BROWSERSLIST_DISABLE_CACHE
-)
+var cacheEnabled = !env.BROWSERSLIST_DISABLE_CACHE
 var filenessCache = {}
 var configCache = {}
 
 function isFile (file) {
-  if (!fs.existsSync) {
-    return false
-  }
   if (file in filenessCache) {
     return filenessCache[file]
   }
@@ -73,9 +91,9 @@ function eachParent (file, callback) {
 function getStat (opts) {
   if (opts.stats) {
     return opts.stats
-  } else if (process.env.BROWSERSLIST_STATS) {
-    return process.env.BROWSERSLIST_STATS
-  } else if (opts.path) {
+  } else if (env.BROWSERSLIST_STATS) {
+    return env.BROWSERSLIST_STATS
+  } else if (opts.path && path.resolve) {
     return eachParent(opts.path, function (dir) {
       var file = path.join(dir, 'browserslist-stats.json')
       return isFile(file) ? file : undefined
@@ -96,18 +114,18 @@ function parsePackage (file) {
 function pickEnv (config, opts) {
   if (typeof config !== 'object') return config
 
-  var env
+  var name
   if (typeof opts.env === 'string') {
-    env = opts.env
-  } else if (typeof process.env.BROWSERSLIST_ENV === 'string') {
-    env = process.env.BROWSERSLIST_ENV
-  } else if (typeof process.env.NODE_ENV === 'string') {
-    env = process.env.NODE_ENV
+    name = opts.env
+  } else if (env.BROWSERSLIST_ENV) {
+    name = env.BROWSERSLIST_ENV
+  } else if (env.NODE_ENV) {
+    name = env.NODE_ENV
   } else {
-    env = 'development'
+    name = 'development'
   }
 
-  return config[env] || config.defaults
+  return config[name] || config.defaults
 }
 
 function generateFilter (sign, version) {
@@ -159,14 +177,14 @@ function browserslist (queries, opts) {
   if (typeof opts === 'undefined') opts = { }
 
   if (!opts.hasOwnProperty('path')) {
-    opts.path = path.resolve('.')
+    opts.path = path.resolve ? path.resolve('.') : '.'
   }
 
   if (typeof queries === 'undefined' || queries === null) {
-    if (process.env.BROWSERSLIST) {
-      queries = process.env.BROWSERSLIST
-    } else if (opts.config || process.env.BROWSERSLIST_CONFIG) {
-      var file = opts.config || process.env.BROWSERSLIST_CONFIG
+    if (env.BROWSERSLIST) {
+      queries = env.BROWSERSLIST
+    } else if (opts.config || env.BROWSERSLIST_CONFIG) {
+      var file = opts.config || env.BROWSERSLIST_CONFIG
       if (path.basename(file) === 'package.json') {
         queries = pickEnv(parsePackage(file), opts)
       } else {
@@ -221,8 +239,8 @@ function browserslist (queries, opts) {
       selection = selection.slice(4)
     }
 
-    for (var i in browserslist.queries) {
-      var type = browserslist.queries[i]
+    for (var i = 0; i < QUERIES.length; i++) {
+      var type = QUERIES[i]
       var match = selection.match(type.regexp)
       if (match) {
         var args = [context].concat(match.slice(1))
@@ -248,7 +266,7 @@ function browserslist (queries, opts) {
     var name = parts[0]
     var version = parts[1]
     if (version === '0') {
-      return name + ' ' + browserslist.byName(name).versions[0]
+      return name + ' ' + byName(name).versions[0]
     } else {
       return i
     }
@@ -329,7 +347,7 @@ browserslist.aliases = {
 browserslist.versionAliases = { }
 
 // Get browser data by alias or case insensitive name
-browserslist.byName = function (name) {
+function byName (name) {
   name = name.toLowerCase()
   name = browserslist.aliases[name] || name
   return browserslist.data[name]
@@ -337,8 +355,8 @@ browserslist.byName = function (name) {
 
 // Get browser data by alias or case insensitive name and throw error
 // on unknown browser
-browserslist.checkName = function (name) {
-  var data = browserslist.byName(name)
+function checkName (name) {
+  var data = byName(name)
   if (!data) throw new BrowserslistError('Unknown browser ' + name)
   return data
 }
@@ -353,6 +371,8 @@ browserslist.readConfig = function (file) {
 
 // Find config, read file and parse it
 browserslist.findConfig = function (from) {
+  if (!path.resolve) return undefined
+
   from = path.resolve(from)
 
   var cacheKey = isFile(from) ? path.dirname(from) : from
@@ -370,8 +390,7 @@ browserslist.findConfig = function (from) {
       try {
         pkgBrowserslist = parsePackage(pkg)
       } catch (e) {
-        console.warn(
-          '[Browserslist] Could not parse ' + pkg + '. Ignoring it.')
+        console.warn('[Browserslist] Could not parse ' + pkg + '. Ignoring it.')
       }
     }
 
@@ -462,69 +481,79 @@ browserslist.clearCaches = function () {
   configCache = {}
 }
 
-browserslist.queries = {
+var QUERIES = [
+  {
+    regexp: /^last\s+(\d+)\s+major versions?$/i,
+    select: function (context, versions) {
+      var selected = []
+      Object.keys(agents).forEach(function (name) {
+        var data = byName(name)
+        if (!data) return
+        var array = getMajorVersions(data.released, versions)
 
-  lastVersions: {
+        array = array.map(nameMapper(data.name))
+        selected = selected.concat(array)
+      })
+      return selected
+    }
+  },
+  {
     regexp: /^last\s+(\d+)\s+versions?$/i,
     select: function (context, versions) {
       var selected = []
-      Object.keys(caniuse).forEach(function (name) {
-        var data = browserslist.byName(name)
+      Object.keys(agents).forEach(function (name) {
+        var data = byName(name)
         if (!data) return
         var array = data.released.slice(-versions)
 
-        array = array.map(function (v) {
-          return data.name + ' ' + v
-        })
+        array = array.map(nameMapper(data.name))
         selected = selected.concat(array)
       })
       return selected
     }
   },
-
-  lastByBrowser: {
+  {
+    regexp: /^last\s+(\d+)\s+(\w+)\s+major versions?$/i,
+    select: function (context, versions, name) {
+      var data = checkName(name)
+      var validVersions = getMajorVersions(data.released, versions)
+      return validVersions.map(nameMapper(data.name))
+    }
+  },
+  {
     regexp: /^last\s+(\d+)\s+(\w+)\s+versions?$/i,
     select: function (context, versions, name) {
-      var data = browserslist.checkName(name)
-      return data.released.slice(-versions).map(function (v) {
-        return data.name + ' ' + v
-      })
+      var data = checkName(name)
+      return data.released.slice(-versions).map(nameMapper(data.name))
     }
   },
-
-  unreleased: {
+  {
     regexp: /^unreleased\s+versions$/i,
     select: function () {
       var selected = []
-      Object.keys(caniuse).forEach(function (name) {
-        var data = browserslist.byName(name)
+      Object.keys(agents).forEach(function (name) {
+        var data = byName(name)
         if (!data) return
         var array = data.versions.filter(function (v) {
           return data.released.indexOf(v) === -1
         })
 
-        array = array.map(function (v) {
-          return data.name + ' ' + v
-        })
+        array = array.map(nameMapper(data.name))
         selected = selected.concat(array)
       })
       return selected
     }
   },
-
-  unreleasedByBrowser: {
+  {
     regexp: /^unreleased\s+(\w+)\s+versions?$/i,
     select: function (context, name) {
-      var data = browserslist.checkName(name)
+      var data = checkName(name)
       return data.versions.filter(function (v) {
         return data.released.indexOf(v) === -1
-      }).map(function (v) {
-        return data.name + ' ' + v
-      })
+      }).map(nameMapper(data.name))
     }
   },
-
-  globalStatistics: {
+  {
     regexp: /^(>=?)\s*(\d*\.?\d+)%$/,
     select: function (context, sign, popularity) {
       popularity = parseFloat(popularity)
@@ -543,8 +572,7 @@ browserslist.queries = {
       return result
     }
   },
-
-  customStatistics: {
+  {
     regexp: /^(>=?)\s*(\d*\.?\d+)%\s+in\s+my\s+stats$/,
     select: function (context, sign, popularity) {
       popularity = parseFloat(popularity)
@@ -567,8 +595,7 @@ browserslist.queries = {
       return result
     }
   },
-
-  countryStatistics: {
+  {
     regexp: /^(>=?)\s*(\d*\.?\d+)%\s+in\s+((alt-)?\w\w)$/,
     select: function (context, sign, popularity, place) {
       popularity = parseFloat(popularity)
@@ -596,8 +623,7 @@ browserslist.queries = {
       return result
     }
   },
-
-  electronRange: {
+  {
     regexp: /^electron\s+([\d.]+)\s*-\s*([\d.]+)$/i,
     select: function (context, from, to) {
       if (!e2c[from]) {
@@ -618,11 +644,10 @@ browserslist.queries = {
       })
     }
   },
-
-  range: {
+  {
     regexp: /^(\w+)\s+([\d.]+)\s*-\s*([\d.]+)$/i,
     select: function (context, name, from, to) {
-      var data = browserslist.checkName(name)
+      var data = checkName(name)
       from = parseFloat(normalizeVersion(data, from) || from)
       to = parseFloat(normalizeVersion(data, to) || to)
 
@@ -631,13 +656,10 @@ browserslist.queries = {
         return parsed >= from && parsed <= to
       }
 
-      return data.released.filter(filter).map(function (v) {
-        return data.name + ' ' + v
-      })
+      return data.released.filter(filter).map(nameMapper(data.name))
     }
   },
-
-  electronVersions: {
+  {
     regexp: /^electron\s*(>=?|<=?)\s*([\d.]+)$/i,
     select: function (context, sign, version) {
       return Object.keys(e2c)
@@ -647,12 +669,11 @@ browserslist.queries = {
         })
     }
   },
-
-  versions: {
+  {
     regexp: /^(\w+)\s*(>=?|<=?)\s*([\d.]+)$/,
     select: function (context, name, sign, version) {
-      var data = browserslist.checkName(name)
-      var alias = normalizeVersion(data, version)
+      var data = checkName(name)
+      var alias = browserslist.versionAliases[data.name][version]
       if (alias) {
         version = alias
       }
@@ -663,22 +684,19 @@ browserslist.queries = {
         })
     }
   },
-
-  esr: {
+  {
     regexp: /^(firefox|ff|fx)\s+esr$/i,
     select: function () {
       return ['firefox 52']
     }
   },
-
-  opMini: {
+  {
     regexp: /(operamini|op_mini)\s+all/i,
     select: function () {
       return ['op_mini all']
     }
   },
-
-  electron: {
+  {
     regexp: /^electron\s+([\d.]+)$/i,
     select: function (context, version) {
       var chrome = e2c[version]
@@ -689,12 +707,11 @@ browserslist.queries = {
       return ['chrome ' + chrome]
     }
   },
-
-  direct: {
+  {
     regexp: /^(\w+)\s+(tp|[\d.]+)$/i,
     select: function (context, name, version) {
       if (/^tp$/i.test(version)) version = 'TP'
-      var data = browserslist.checkName(name)
+      var data = checkName(name)
       var alias = normalizeVersion(data, version)
       if (alias) {
         version = alias
@@ -715,25 +732,23 @@ browserslist.queries = {
       return [data.name + ' ' + version]
     }
   },
-
-  defaults: {
+  {
     regexp: /^defaults$/i,
     select: function () {
       return browserslist(browserslist.defaults)
     }
   }
-
-};
+];
 
 // Get and convert Can I Use data
 
 (function () {
-  for (var name in caniuse) {
-    var browser = caniuse[name]
+  for (var name in agents) {
+    var browser = agents[name]
     browserslist.data[name] = {
       name: name,
-      versions: normalize(caniuse[name].versions),
-      released: normalize(caniuse[name].versions.slice(0, -3))
+      versions: normalize(agents[name].versions),
+      released: normalize(agents[name].versions.slice(0, -3))
     }
     fillUsage(browserslist.usage.global, name, browser.usage_global)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Share browsers list between different front-end tools, like Autoprefixer, Stylelint and babel-env-preset",
   "keywords": [
     "caniuse",
@@ -10,13 +10,13 @@
   "license": "MIT",
   "repository": "ai/browserslist",
   "dependencies": {
-    "caniuse-lite": "^1.0.30000710",
-    "electron-to-chromium": "^1.3.17"
+    "caniuse-lite": "^1.0.30000718",
+    "electron-to-chromium": "^1.3.18"
   },
   "bin": "./cli.js",
   "devDependencies": {
     "cross-spawn": "^5.1.0",
-    "eslint": "^4.3.0",
+    "eslint": "^4.5.0",
     "eslint-config-logux": "^16.0.0",
     "eslint-config-standard": "^10.2.1",
     "eslint-plugin-es5": "^1.1.0",
@@ -27,8 +27,9 @@
     "eslint-plugin-security": "^1.4.0",
     "eslint-plugin-standard": "^3.0.1",
     "jest": "^20.0.4",
-    "lint-staged": "^4.0.2",
+    "lint-staged": "^4.0.4",
     "pre-commit": "^1.1.3",
+    "size-limit": "^0.10.0",
     "yaspeller-ci": "^0.6.0"
   },
   "eslintConfig": {
@@ -52,17 +53,24 @@
       }
     }
   },
+  "size-limit": [
+    {
+      "path": "index.js",
+      "limit": "152 KB"
+    }
+  ],
   "scripts": {
     "lint-staged": "lint-staged",
     "spellcheck": "yaspeller-ci README.md CHANGELOG.md",
-    "lint": "eslint *.js test/*.js",
-    "test": "jest --coverage && yarn lint && yarn spellcheck"
+    "lint": "eslint *.js test/*.js __mocks__/*.js",
+    "test": "jest --coverage && yarn lint && yarn spellcheck && size-limit"
   },
   "lint-staged": {
     "*.md": "yaspeller-ci",
     "*.js": "eslint"
   },
   "browser": {
+    "path": false,
     "fs": false
   },
   "pre-commit": [