browserslist 4.24.4 → 4.25.0

package/index.js

@@ -458,6 +458,20 @@ function parseQueries(queries) {
   return result
 }
 
+function loadCustomUsage(context, config) {
+  var stats = env.loadStat(context, config, browserslist.data)
+  if (stats) {
+    context.customUsage = {}
+    for (var browser in stats) {
+      fillUsage(context.customUsage, browser, stats[browser])
+    }
+  }
+  if (!context.customUsage) {
+    throw new BrowserslistError('Custom usage statistics was not provided')
+  }
+  return context.customUsage
+}
+
 browserslist.parse = function (queries, opts) {
   opts = prepareOpts(opts)
   queries = prepareQueries(queries, opts)
@@ -598,19 +612,21 @@ function coverQuery(context, node) {
       env.loadCountry(browserslist.usage, place, browserslist.data)
       usage = browserslist.usage[place]
     }
+  } else if (node.config) {
+    usage = loadCustomUsage(context, node.config)
   }
   var versions = Object.keys(usage).sort(function (a, b) {
     return usage[b] - usage[a]
   })
-  var coveraged = 0
+  var covered = 0
   var result = []
   var version
   for (var i = 0; i < versions.length; i++) {
     version = versions[i]
     if (usage[version] === 0) break
-    coveraged += usage[version]
+    covered += usage[version]
     result.push(version)
-    if (coveraged >= coverage) break
+    if (covered >= coverage) break
   }
   return result
 }
@@ -829,17 +845,7 @@ var QUERIES = {
     regexp: /^(>=?|<=?)\s*(\d+|\d+\.\d+|\.\d+)%\s+in\s+(\S+)\s+stats$/,
     select: function (context, node) {
       var popularity = parseFloat(node.popularity)
-      var stats = env.loadStat(context, node.config, browserslist.data)
-      if (stats) {
-        context.customUsage = {}
-        for (var browser in stats) {
-          fillUsage(context.customUsage, browser, stats[browser])
-        }
-      }
-      if (!context.customUsage) {
-        throw new BrowserslistError('Custom usage statistics was not provided')
-      }
-      var usage = context.customUsage
+      var usage = loadCustomUsage(context, node.config)
       return Object.keys(usage).reduce(function (result, version) {
         var percentage = usage[version]
         if (percentage == null) {
@@ -913,6 +919,11 @@ var QUERIES = {
     regexp: /^cover\s+(\d+|\d+\.\d+|\.\d+)%\s+in\s+(my\s+stats|(alt-)?\w\w)$/i,
     select: coverQuery
   },
+  cover_config: {
+    matches: ['coverage', 'config'],
+    regexp: /^cover\s+(\d+|\d+\.\d+|\.\d+)%\s+in\s+(\S+)\s+stats$/i,
+    select: coverQuery
+  },
   supports: {
     matches: ['supportType', 'feature'],
     regexp: /^(?:(fully|partially)\s+)?supports\s+([\w-]+)$/,

package/node.js

@@ -51,23 +51,23 @@ function eachParent(file, callback, cache) {
     if (!pathInRoot(loc)) {
       break
     }
-    if (cache && (loc in cache)) {
+    if (cache && loc in cache) {
       result = cache[loc]
       break
     }
     pathsForCacheResult.push(loc)
-    
+
     if (!isDirectory(loc)) {
       continue
     }
-    
+
     var locResult = callback(loc)
     if (typeof locResult !== 'undefined') {
       result = locResult
       break
     }
   } while (loc !== (loc = path.dirname(loc)))
-  
+
   if (cache && !process.env.BROWSERSLIST_DISABLE_CACHE) {
     pathsForCacheResult.forEach(function (cachePath) {
       cache[cachePath] = result
@@ -152,10 +152,10 @@ function parsePackageOrReadConfig(file) {
   if (file in parseConfigCache) {
     return parseConfigCache[file]
   }
-  
+
   var isPackage = path.basename(file) === 'package.json'
   var result = isPackage ? parsePackage(file) : module.exports.readConfig(file)
-  
+
   if (!process.env.BROWSERSLIST_DISABLE_CACHE) {
     parseConfigCache[file] = result
   }
@@ -229,6 +229,9 @@ module.exports = {
       checkExtend(name)
     }
     var queries = require(require.resolve(name, { paths: ['.', ctx.path] }))
+    if (typeof queries === 'object' && queries !== null && queries.__esModule) {
+      queries = queries.default
+    }
     if (queries) {
       if (Array.isArray(queries)) {
         return queries
@@ -263,10 +266,14 @@ module.exports = {
     } else if (process.env.BROWSERSLIST_STATS) {
       stats = process.env.BROWSERSLIST_STATS
     } else if (opts.path && path.resolve && fs.existsSync) {
-      stats = eachParent(opts.path, function (dir) {
-        var file = path.join(dir, 'browserslist-stats.json')
-        return isFile(file) ? file : undefined
-      }, statCache)
+      stats = eachParent(
+        opts.path,
+        function (dir) {
+          var file = path.join(dir, 'browserslist-stats.json')
+          return isFile(file) ? file : undefined
+        },
+        statCache
+      )
     }
     if (typeof stats === 'string') {
       try {
@@ -374,43 +381,48 @@ module.exports = {
   },
 
   findConfigFile: function findConfigFile(from) {
-    return eachParent(from, function (dir) {
-      var config = path.join(dir, 'browserslist')
-      var pkg = path.join(dir, 'package.json')
-      var rc = path.join(dir, '.browserslistrc')
-
-      var pkgBrowserslist
-      if (isFile(pkg)) {
-        try {
-          pkgBrowserslist = parsePackage(pkg)
-        } catch (e) {
-          if (e.name === 'BrowserslistError') throw e
-          console.warn(
-            '[Browserslist] Could not parse ' + pkg + '. Ignoring it.'
-          )
+    return eachParent(
+      from,
+      function (dir) {
+        var config = path.join(dir, 'browserslist')
+        var pkg = path.join(dir, 'package.json')
+        var rc = path.join(dir, '.browserslistrc')
+
+        var pkgBrowserslist
+        if (isFile(pkg)) {
+          try {
+            pkgBrowserslist = parsePackage(pkg)
+          } catch (e) {
+            if (e.name === 'BrowserslistError') throw e
+            console.warn(
+              '[Browserslist] Could not parse ' + pkg + '. Ignoring it.'
+            )
+          }
         }
-      }
 
-      if (isFile(config) && pkgBrowserslist) {
-        throw new BrowserslistError(
-          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'
-        )
-      } else if (isFile(config) && isFile(rc)) {
-        throw new BrowserslistError(
-          dir + ' contains both .browserslistrc and browserslist'
-        )
-      } else if (isFile(config)) {
-        return config
-      } else if (isFile(rc)) {
-        return rc
-      } else if (pkgBrowserslist) {
-        return pkg
-      }
-    }, configPathCache)
+        if (isFile(config) && pkgBrowserslist) {
+          throw new BrowserslistError(
+            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'
+          )
+        } else if (isFile(config) && isFile(rc)) {
+          throw new BrowserslistError(
+            dir + ' contains both .browserslistrc and browserslist'
+          )
+        } else if (isFile(config)) {
+          return config
+        } else if (isFile(rc)) {
+          return rc
+        } else if (pkgBrowserslist) {
+          return pkg
+        }
+      },
+      configPathCache
+    )
   },
 
   findConfig: function findConfig(from) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.24.4",
+  "version": "4.25.0",
   "description": "Share target browsers between different front-end tools, like Autoprefixer, Stylelint and babel-env-preset",
   "keywords": [
     "caniuse",
@@ -25,10 +25,10 @@
   "license": "MIT",
   "repository": "browserslist/browserslist",
   "dependencies": {
-    "caniuse-lite": "^1.0.30001688",
-    "electron-to-chromium": "^1.5.73",
+    "caniuse-lite": "^1.0.30001718",
+    "electron-to-chromium": "^1.5.160",
     "node-releases": "^2.0.19",
-    "update-browserslist-db": "^1.1.1"
+    "update-browserslist-db": "^1.1.3"
   },
   "engines": {
     "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"