browserslist 4.3.6 → 4.4.2

package/CHANGELOG.md

@@ -1,6 +1,19 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.4.2
+* Allow to have string in `package.json` (by @dmarkhas).
+
+## 4.4.1
+* Allow to use `.` in scope name of shareable config (by Gustav Nikolaj).
+
+## 4.4
+* Added `and` and `or` keywords to combine queries (by Jon Ege Ronnenberg).
+
+## 4.3.7
+* Fix fraction years support in `last 1.5 years` (by Clément P).
+* Fix version-less browser support.
+
 ## 4.3.6
 * Fix version-less browser support in custom statistics (by Alex Walter).
 

package/README.md

@@ -1,7 +1,7 @@
 # Browserslist [![Cult Of Martians][cult-img]][cult]
 
 <img width="120" height="120" alt="Browserslist logo by Anton Lovchikov"
-     src="http://browserslist.github.io/browserslist/logo.svg" align="right">
+     src="https://browserslist.github.io/browserslist/logo.svg" align="right">
 
 The config to share target browsers and Node.js versions between different
 front-end tools. It is used in:
@@ -12,6 +12,7 @@ front-end tools. It is used in:
 * [eslint-plugin-compat]
 * [stylelint-no-unsupported-browser-features]
 * [postcss-normalize]
+* [obsolete-webpack-plugin]
 
 [Browserslist Example] shows how every tool uses Browserslist.
 All tools will find target browsers automatically,
@@ -41,16 +42,16 @@ not dead
 
 Developers set versions list in queries like `last 2 version`
 to be free from updating versions manually.
-Browserslist will use [Can I Use] data for this queries.
+Browserslist will use [Can I Use] data for this queries.
 
 Browserslist will take queries from tool option,
 `browserslist` config, `.browserslistrc` config,
-`browserslist` section in `package.json` or environment variables.
+`browserslist` section in `package.json` or environment variables.
 
 You can test Browserslist queries in [online demo].
 
-[cult-img]: http://cultofmartians.com/assets/badges/badge.svg
-[cult]: http://cultofmartians.com/done.html
+[cult-img]: https://cultofmartians.com/assets/badges/badge.svg
+[cult]: https://cultofmartians.com/done.html
 
 <a href="https://evilmartians.com/?utm_source=browserslist">
   <img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg"
@@ -59,13 +60,14 @@ You can test Browserslist queries in [online demo].
 
 [stylelint-no-unsupported-browser-features]: https://github.com/ismay/stylelint-no-unsupported-browser-features
 [eslint-plugin-compat]:                      https://github.com/amilajack/eslint-plugin-compat
-[Browserslist Example]:                       https://github.com/browserslist/browserslist-example
+[Browserslist Example]:                      https://github.com/browserslist/browserslist-example
 [postcss-preset-env]:                        https://github.com/jonathantneal/postcss-preset-env
 [postcss-normalize]:                         https://github.com/jonathantneal/postcss-normalize
 [Autoprefixer]:                              https://github.com/postcss/autoprefixer
-[online demo]:                               http://browserl.ist/
-[Can I Use]:                                 http://caniuse.com/
-[Babel]:                          https://github.com/babel/babel/tree/master/packages/babel-preset-env
+[online demo]:                               https://browserl.ist/
+[Can I Use]:                                 https://caniuse.com/
+[Babel]:                                     https://github.com/babel/babel/tree/master/packages/babel-preset-env
+[obsolete-webpack-plugin]:                   https://github.com/ElemeFE/obsolete-webpack-plugin
 
 ## Tools
 
@@ -102,14 +104,38 @@ from one of this sources:
    `> 0.5%, last 2 versions, Firefox ESR, not dead`.
 
 
+### Query Composition
+
+An `or` combiner can use the keyword `or` as well as `,`.
+`last 1 version or > 1%` is equal to `last 1 version, > 1%`.
+
+`and` query combinations are also supported to perform an
+intersection of the previous query: `last 1 version and > 1%`.
+
+There is 3 different ways to combine queries as depicted below. First you start
+with a single query and then we combine the queries to get our final list.
+
+Obviously you can *not* start with a `not` combiner, since the is no left-hand
+side query to combine it with.
+
+| Query combiner type | Illustration | Example |
+| ------------------- | :----------: | ------- |
+|`or`/ `,` combiner <br> (union) | ![Union of queries](img/union.svg)  | `'> .5% or last 2 versions'` <br> `'> .5%, last 2 versions'` |
+| `and` combiner <br> (intersection) | ![intersection of queries](img/intersection.svg) | `'> .5% and last 2 versions'` |
+| `not` combiner <br> (relative complement) | ![Relative complement of queries](img/complement.svg) | `'> .5% and not last 2 versions'` <br> `'> .5% or not last 2 versions'` <br> `'> .5%, not last 2 versions'` |
+
+_A quick way to test your query is to do `npx browserslist '> 0.5%, not IE 11'`
+in your terminal._
+
+
 ### Best Practices
 
 * Select browsers directly (`last 2 Chrome versions`) only if you are making
-  a web app for a kiosk with one browser. There are a lot of browsers
+  a web app for a kiosk with one browser. There are a lot of browsers
   on the market. If you are making general web app you should respect
   browsers diversity.
 * If you want to change the default set of browsers we recommend to combine
-  `last 1 version`, `not dead` with `> 0.2%` (or `> 1% in US`,
+  `last 1 version`, `not dead` with `> 0.2%` (or `> 1% in US`,
   `> 1% in my stats`). `last n versions` adds too many dead browsers
   and does not add popular old versions. Choosing a percentage above `0.2%`
   will in the long run make popular browsers even more popular. We might run
@@ -193,19 +219,17 @@ samsung 5
 
 Browserslist works with separated versions of browsers.
 You should avoid queries like `Firefox > 0`.
-
-Multiple criteria are combined as a boolean `OR`. A browser version must match
-at least one of the criteria to be selected.
+The list of the specified browsers acts as a white list which means other browsers are ignored.
 
 All queries are based on the [Can I Use] support table,
 e.g. `last 3 iOS versions` might select `8.4, 9.2, 9.3` (mixed major and minor),
 whereas `last 3 Chrome versions` might select `50, 49, 48` (major only).
 
 [`caniuse-lite/data/regions`]: https://github.com/ben-eb/caniuse-lite/tree/master/data/regions
-[two-letter country code]:     http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements
+[two-letter country code]:     https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements
 [custom usage data]:           #custom-usage-data
 [still maintained]:            https://github.com/nodejs/Release
-[Can I Use]:                   http://caniuse.com/
+[Can I Use]:                   https://caniuse.com/
 
 
 ### Browsers
@@ -425,7 +449,7 @@ while also querying against global or regional data.
 For example, the query `> 1% in my stats, > 5% in US, 10%` is permitted.
 
 [`browserslist-ga`]: https://github.com/browserslist/browserslist-ga
-[Can I Use]:         http://caniuse.com/
+[Can I Use]:         https://caniuse.com/
 
 
 ## JS API

package/index.js

@@ -8,6 +8,13 @@ var BrowserslistError = require('./error')
 var env = require('./node') // Will load browser.js in webpack
 
 var FLOAT_RANGE = /^\d+(\.\d+)?(-\d+(\.\d+)?)*$/
+var YEAR = 365.259641 * 24 * 60 * 60 * 1000
+
+// Enum values MUST be powers of 2, so combination are safe
+/** @constant {number} */
+var QUERY_OR = 1
+/** @constant {number} */
+var QUERY_AND = 2
 
 function isVersionsMatch (versionA, versionB) {
   return (versionA + '.').indexOf(versionB + '.') === 0
@@ -103,6 +110,7 @@ function normalizeVersion (data, version) {
 }
 
 function filterByYear (since) {
+  since = since / 1000
   return Object.keys(agents).reduce(function (selected, name) {
     var data = byName(name)
     if (!data) return selected
@@ -132,10 +140,23 @@ function unknownQuery (query) {
   )
 }
 
+/**
+ * Resolves queries into a browser list.
+ * @param {string|string[]} queries Queries to combine.
+ * Either an array of queries or a long string of queries.
+ * @param {object} [context] Optional arguments to
+ * the select function in `queries`.
+ * @returns {string[]} A list of browsers
+ */
 function resolve (queries, context) {
-  return queries.reduce(function (result, selection, index) {
-    selection = selection.trim()
-    if (selection === '') return result
+  if (Array.isArray(queries)) {
+    queries = flatten(queries.map(parse))
+  } else {
+    queries = parse(queries)
+  }
+
+  return queries.reduce(function (result, query, index) {
+    var selection = query.queryString
 
     var isExclude = selection.indexOf('not ') === 0
     if (isExclude) {
@@ -152,35 +173,44 @@ function resolve (queries, context) {
       var match = selection.match(type.regexp)
       if (match) {
         var args = [context].concat(match.slice(1))
-        var array = type.select.apply(browserslist, args)
-        if (isExclude) {
-          var filter = { }
-          var browsers = { }
-          var versionLess = { }
-          array.forEach(function (j) {
-            filter[j] = true
-            var browser = j.replace(/\s\S+$/, '')
-            browsers[browser] = true
-            if (/\s0$/.test(j)) {
-              versionLess[browser] = true
-            }
-          })
-          return result.filter(function (j) {
-            if (filter[j]) {
-              return false
+        var array = type.select.apply(browserslist, args).map(function (j) {
+          var parts = j.split(' ')
+          if (parts[1] === '0') {
+            return parts[0] + ' ' + byName(parts[0]).versions[0]
+          } else {
+            return j
+          }
+        })
+
+        switch (query.type) {
+          case QUERY_AND:
+            if (isExclude) {
+              return result.filter(function (j) {
+                // remove result items that are in array
+                // (the relative complement of array in result)
+                return array.indexOf(j) === -1
+              })
             } else {
-              var browser = j.replace(/\s\S+$/, '')
-              if (versionLess[browser]) {
-                return false
-              } else if (/\s0$/.test(j) && browsers[browser]) {
-                return false
-              } else {
-                return true
-              }
+              return result.filter(function (j) {
+                // remove result items not in array
+                // (intersect of result and array)
+                return array.indexOf(j) !== -1
+              })
             }
-          })
+          case QUERY_OR:
+          default:
+            if (isExclude) {
+              var filter = { }
+              array.forEach(function (j) {
+                filter[j] = true
+              })
+              return result.filter(function (j) {
+                return !filter[j]
+              })
+            }
+            // union of result and array
+            return result.concat(array)
         }
-        return result.concat(array)
       }
     }
 
@@ -205,7 +235,7 @@ function resolve (queries, context) {
  *                                                     version in direct query.
  * @param {boolean} [opts.dangerousExtend] Disable security checks
  *                                         for extend query.
- * @return {string[]} Array with browser names in Can I Use.
+ * @returns {string[]} Array with browser names in Can I Use.
  *
  * @example
  * browserslist('IE >= 10, IE 8') //=> ['ie 11', 'ie 10', 'ie 8']
@@ -226,13 +256,9 @@ function browserslist (queries, opts) {
     }
   }
 
-  if (typeof queries === 'string') {
-    queries = queries.split(/,\s*/)
-  }
-
-  if (!Array.isArray(queries)) {
+  if (!(typeof queries === 'string' || Array.isArray(queries))) {
     throw new BrowserslistError(
-      'Browser queries must be an array. Got ' + typeof queries + '.')
+      'Browser queries must be an array or string. Got ' + typeof queries + '.')
   }
 
   var context = {
@@ -249,16 +275,7 @@ function browserslist (queries, opts) {
     }
   }
 
-  var result = resolve(queries, context).map(function (i) {
-    var parts = i.split(' ')
-    var name = parts[0]
-    var version = parts[1]
-    if (version === '0') {
-      return name + ' ' + byName(name).versions[0]
-    } else {
-      return i
-    }
-  }).sort(function (name1, name2) {
+  var result = resolve(queries, context).sort(function (name1, name2) {
     name1 = name1.split(' ')
     name2 = name2.split(' ')
     if (name1[0] === name2[0]) {
@@ -275,6 +292,74 @@ function browserslist (queries, opts) {
   return uniq(result)
 }
 
+/**
+ * @typedef {object} BrowserslistQuery
+ * @property {number} type A type constant like QUERY_OR @see QUERY_OR.
+ * @property {string} queryString A query like "not ie < 11".
+ */
+
+/**
+ * Parse a browserslist string query
+ * @param {string} queries One or more queries as a string
+ * @returns {BrowserslistQuery[]} An array of BrowserslistQuery
+ */
+function parse (queries) {
+  var qs = []
+
+  do {
+    queries = doMatch(queries, qs)
+  } while (queries)
+
+  return qs
+}
+
+/**
+ * Find query matches in a string. This function is meant to be called
+ * repeatedly with the returned query string until there is no more matches.
+ * @param {string} string A string with one or more queries.
+ * @param {BrowserslistQuery[]} qs Out parameter,
+ * will be filled with `BrowserslistQuery`.
+ * @returns {string} The rest of the query string minus the matched part.
+ */
+function doMatch (string, qs) {
+  var or = /^(?:,\s*|\s+OR\s+)(.*)/i
+  var and = /^\s+AND\s+(.*)/i
+
+  return find(
+    string,
+    function (parsed, n, max) {
+      if (and.test(parsed)) {
+        qs.unshift({ type: QUERY_AND, queryString: parsed.match(and)[1] })
+        return true
+      } else if (or.test(parsed)) {
+        qs.unshift({ type: QUERY_OR, queryString: parsed.match(or)[1] })
+        return true
+      } else if (n === max) {
+        qs.unshift({ type: QUERY_OR, queryString: parsed.trim() })
+        return true
+      }
+      return false
+    }
+  )
+}
+
+function find (string, predicate) {
+  for (var n = 1, max = string.length; n <= max; n++) {
+    var parsed = string.substr(-n, n)
+    if (predicate(parsed, n, max)) {
+      return string.replace(parsed, '')
+    }
+  }
+  return ''
+}
+
+function flatten (array) {
+  if (!Array.isArray(array)) return [array]
+  return array.reduce(function (a, b) {
+    return a.concat(flatten(b))
+  }, [])
+}
+
 // Will be filled by Can I Use data below
 browserslist.data = { }
 browserslist.usage = {
@@ -463,12 +548,9 @@ var QUERIES = [
     }
   },
   {
-    regexp: /^last\s+(\d+)\s+years?$/i,
+    regexp: /^last\s+(\d*.?\d+)\s+years?$/i,
     select: function (context, years) {
-      var date = new Date()
-      var since = date.setFullYear(date.getFullYear() - years) / 1000
-
-      return filterByYear(since)
+      return filterByYear(Date.now() - YEAR * years)
     }
   },
   {
@@ -477,9 +559,7 @@ var QUERIES = [
       year = parseInt(year)
       month = parseInt(month || '01') - 1
       date = parseInt(date || '01')
-      var since = Date.UTC(year, month, date, 0, 0, 0) / 1000
-
-      return filterByYear(since)
+      return filterByYear(Date.UTC(year, month, date, 0, 0, 0))
     }
   },
   {

package/node.js

@@ -6,7 +6,7 @@ var BrowserslistError = require('./error')
 
 var IS_SECTION = /^\s*\[(.+)\]\s*$/
 var CONFIG_PATTERN = /^browserslist-config-/
-var SCOPED_CONFIG__PATTERN = /@[^./]+\/browserslist-config(-|$|\/)/
+var SCOPED_CONFIG__PATTERN = /@[^/]+\/browserslist-config(-|$|\/)/
 var TIME_TO_UPDATE_CANIUSE = 6 * 30 * 24 * 60 * 60 * 1000
 var FORMAT = 'Browserslist config should be a string or an array ' +
              'of strings with browser queries'
@@ -14,14 +14,13 @@ var FORMAT = 'Browserslist config should be a string or an array ' +
 var dataTimeChecked = false
 var filenessCache = { }
 var configCache = { }
-
 function checkExtend (name) {
   var use = ' Use `dangerousExtend` option to disable.'
   if (!CONFIG_PATTERN.test(name) && !SCOPED_CONFIG__PATTERN.test(name)) {
     throw new BrowserslistError(
       'Browserslist config needs `browserslist-config-` prefix. ' + use)
   }
-  if (name.indexOf('.') !== -1) {
+  if (name.replace(/^@[^/]+\//, '').indexOf('.') !== -1) {
     throw new BrowserslistError(
       '`.` not allowed in Browserslist config name. ' + use)
   }
@@ -87,10 +86,9 @@ function parsePackage (file) {
       '`browserlist` key instead of `browserslist` in ' + file)
   }
   var list = config.browserslist
-  if (Array.isArray(list)) {
+  if (Array.isArray(list) || typeof list === 'string') {
     list = { defaults: list }
   }
-
   for (var i in list) {
     check(list[i])
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.3.6",
+  "version": "4.4.2",
   "description": "Share target browsers between different front-end tools, like Autoprefixer, Stylelint and babel-env-preset",
   "keywords": [
     "caniuse",
@@ -11,9 +11,9 @@
   "license": "MIT",
   "repository": "browserslist/browserslist",
   "dependencies": {
-    "caniuse-lite": "^1.0.30000921",
-    "electron-to-chromium": "^1.3.92",
-    "node-releases": "^1.1.1"
+    "caniuse-lite": "^1.0.30000939",
+    "electron-to-chromium": "^1.3.113",
+    "node-releases": "^1.1.8"
   },
   "bin": "./cli.js",
   "browser": {