browserslist 4.7.1 → 4.7.2

package/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.7.2
+* Add cache for query parsing.
+* Improve config caching (by Kārlis Gaņģis).
+
 ## 4.7.1
 * Improve caching.
 

package/index.js

@@ -289,6 +289,8 @@ function resolve (queries, context) {
   }, [])
 }
 
+var cache = { }
+
 /**
  * Return array of browsers by selection queries.
  *
@@ -350,7 +352,10 @@ function browserslist (queries, opts) {
     }
   }
 
-  var result = resolve(queries, context).sort(function (name1, name2) {
+  var cacheKey = JSON.stringify([queries, context])
+  if (cache[cacheKey]) return cache[cacheKey]
+
+  var result = uniq(resolve(queries, context)).sort(function (name1, name2) {
     name1 = name1.split(' ')
     name2 = name2.split(' ')
     if (name1[0] === name2[0]) {
@@ -363,8 +368,10 @@ function browserslist (queries, opts) {
       return compare(name1[0], name2[0])
     }
   })
-
-  return uniq(result)
+  if (!process.env.BROWSERSLIST_DISABLE_CACHE) {
+    cache[cacheKey] = result
+  }
+  return result
 }
 
 function parse (queries) {
@@ -828,7 +835,7 @@ var QUERIES = [
   {
     regexp: /^(firefox|ff|fx)\s+esr$/i,
     select: function () {
-      return ['firefox 68', 'firefox 60']
+      return ['firefox 68']
     }
   },
   {

package/node.js

@@ -84,7 +84,8 @@ function parsePackage (file) {
   var config = JSON.parse(fs.readFileSync(file))
   if (config.browserlist && !config.browserslist) {
     throw new BrowserslistError(
-      '`browserlist` key instead of `browserslist` in ' + file)
+      '`browserlist` key instead of `browserslist` in ' + file
+    )
   }
   var list = config.browserslist
   if (Array.isArray(list) || typeof list === 'string') {
@@ -117,7 +118,8 @@ module.exports = {
     var queries = require(require.resolve(name, { paths: ['.'] }))
     if (!Array.isArray(queries)) {
       throw new BrowserslistError(
-        '`' + name + '` config exports not an array of queries')
+        '`' + name + '` config exports not an array of queries'
+      )
     }
     return queries
   },
@@ -215,7 +217,8 @@ module.exports = {
           sections.forEach(function (section) {
             if (result[section]) {
               throw new BrowserslistError(
-                'Duplicate section ' + section + ' in Browserslist config')
+                'Duplicate section ' + section + ' in Browserslist config'
+              )
             }
             result[section] = []
           })
@@ -239,13 +242,12 @@ module.exports = {
   findConfig: function findConfig (from) {
     from = path.resolve(from)
 
-    var cacheKey = isFile(from) ? path.dirname(from) : from
-    if (cacheKey in configCache) {
-      return configCache[cacheKey]
-    }
-
     var passed = []
     var resolved = eachParent(from, function (dir) {
+      if (dir in configCache) {
+        return configCache[dir]
+      }
+
       passed.push(dir)
 
       var config = path.join(dir, 'browserslist')
@@ -259,19 +261,23 @@ module.exports = {
         } catch (e) {
           if (e.name === 'BrowserslistError') throw e
           console.warn(
-            '[Browserslist] Could not parse ' + pkg + '. Ignoring it.')
+            '[Browserslist] Could not parse ' + pkg + '. Ignoring it.'
+          )
         }
       }
 
       if (isFile(config) && pkgBrowserslist) {
         throw new BrowserslistError(
-          dir + ' contains both browserslist and package.json with browsers')
+          dir + ' contains both browserslist and package.json with browsers'
+        )
       } else if (isFile(rc) && pkgBrowserslist) {
         throw new BrowserslistError(
-          dir + ' contains both .browserslistrc and package.json with browsers')
+          dir + ' contains both .browserslistrc and package.json with browsers'
+        )
       } else if (isFile(config) && isFile(rc)) {
         throw new BrowserslistError(
-          dir + ' contains both .browserslistrc and browserslist')
+          dir + ' contains both .browserslistrc and browserslist'
+        )
       } else if (isFile(config)) {
         return module.exports.readConfig(config)
       } else if (isFile(rc)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.7.1",
+  "version": "4.7.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.30000999",
-    "electron-to-chromium": "^1.3.284",
-    "node-releases": "^1.1.36"
+    "caniuse-lite": "^1.0.30001004",
+    "electron-to-chromium": "^1.3.295",
+    "node-releases": "^1.1.38"
   },
   "bin": "./cli.js",
   "browser": {