browserslist 4.24.3 → 4.24.5

package/index.js

@@ -6,7 +6,7 @@ var path = require('path')
 
 var BrowserslistError = require('./error')
 var env = require('./node')
-var parse = require('./parse') // Will load browser.js in webpack
+var parseWithoutCache = require('./parse') // Will load browser.js in webpack
 
 var YEAR = 365.259641 * 24 * 60 * 60 * 1000
 var ANDROID_EVERGREEN_FIRST = '37'
@@ -319,7 +319,7 @@ function isSupported(flags, withPartial) {
 }
 
 function resolve(queries, context) {
-  return parse(QUERIES, queries).reduce(function (result, node, index) {
+  return parseQueries(queries).reduce(function (result, node, index) {
     if (node.not && index === 0) {
       throw new BrowserslistError(
         'Write any browsers query (for instance, `defaults`) ' +
@@ -395,19 +395,26 @@ function checkQueries(queries) {
 }
 
 var cache = {}
+var parseCache = {}
 
 function browserslist(queries, opts) {
   opts = prepareOpts(opts)
   queries = prepareQueries(queries, opts)
   checkQueries(queries)
 
+  var needsPath = parseQueries(queries).some(function (node) {
+    return QUERIES[node.type].needsPath
+  })
   var context = {
     ignoreUnknownVersions: opts.ignoreUnknownVersions,
     dangerousExtend: opts.dangerousExtend,
     mobileToDesktop: opts.mobileToDesktop,
-    path: opts.path,
     env: opts.env
   }
+  // Removing to avoid using context.path without marking query as needsPath
+  if (needsPath) {
+    context.path = opts.path
+  }
 
   env.oldDataWarning(browserslist.data)
   var stats = env.getStat(opts, browserslist.data)
@@ -441,11 +448,21 @@ function browserslist(queries, opts) {
   return result
 }
 
+function parseQueries(queries) {
+  var cacheKey = JSON.stringify(queries)
+  if (cacheKey in parseCache) return parseCache[cacheKey]
+  var result = parseWithoutCache(QUERIES, queries)
+  if (!env.env.BROWSERSLIST_DISABLE_CACHE) {
+    parseCache[cacheKey] = result
+  }
+  return result
+}
+
 browserslist.parse = function (queries, opts) {
   opts = prepareOpts(opts)
   queries = prepareQueries(queries, opts)
   checkQueries(queries)
-  return parse(QUERIES, queries)
+  return parseQueries(queries)
 }
 
 // Will be filled by Can I Use data below
@@ -1133,6 +1150,7 @@ var QUERIES = {
   browserslist_config: {
     matches: [],
     regexp: /^browserslist config$/i,
+    needsPath: true,
     select: function (context) {
       return browserslist(undefined, context)
     }
@@ -1140,6 +1158,7 @@ var QUERIES = {
   extends: {
     matches: ['config'],
     regexp: /^extends (.+)$/i,
+    needsPath: true,
     select: function (context, node) {
       return resolve(env.loadQueries(context, node.config), context)
     }

package/node.js

@@ -13,8 +13,10 @@ var FORMAT =
   'of strings with browser queries'
 
 var dataTimeChecked = false
-var filenessCache = {}
-var configCache = {}
+var statCache = {}
+var configPathCache = {}
+var parseConfigCache = {}
+
 function checkExtend(name) {
   var use = ' Use `dangerousExtend` option to disable.'
   if (!CONFIG_PATTERN.test(name) && !SCOPED_CONFIG__PATTERN.test(name)) {
@@ -35,25 +37,43 @@ function checkExtend(name) {
 }
 
 function isFile(file) {
-  if (file in filenessCache) {
-    return filenessCache[file]
-  }
-  var result = fs.existsSync(file) && fs.statSync(file).isFile()
-  if (!process.env.BROWSERSLIST_DISABLE_CACHE) {
-    filenessCache[file] = result
-  }
-  return result
+  return fs.existsSync(file) && fs.statSync(file).isFile()
+}
+function isDirectory(dir) {
+  return fs.existsSync(dir) && fs.statSync(dir).isDirectory()
 }
 
-function eachParent(file, callback) {
-  var dir = isFile(file) ? path.dirname(file) : file
-  var loc = path.resolve(dir)
+function eachParent(file, callback, cache) {
+  var loc = path.resolve(file)
+  var pathsForCacheResult = []
+  var result
   do {
-    if (!pathInRoot(loc)) break
-    var result = callback(loc)
-    if (typeof result !== 'undefined') return result
+    if (!pathInRoot(loc)) {
+      break
+    }
+    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)))
-  return undefined
+
+  if (cache && !process.env.BROWSERSLIST_DISABLE_CACHE) {
+    pathsForCacheResult.forEach(function (cachePath) {
+      cache[cachePath] = result
+    })
+  }
+  return result
 }
 
 function pathInRoot(p) {
@@ -103,18 +123,21 @@ function pickEnv(config, opts) {
 }
 
 function parsePackage(file) {
-  var config = JSON.parse(
-    fs
-      .readFileSync(file)
-      .toString()
-      .replace(/^\uFEFF/m, '')
-  )
-  if (config.browserlist && !config.browserslist) {
-    throw new BrowserslistError(
-      '`browserlist` key instead of `browserslist` in ' + file
-    )
+  var text = fs
+    .readFileSync(file)
+    .toString()
+    .replace(/^\uFEFF/m, '')
+  var list
+  if (text.indexOf('"browserslist"') >= 0) {
+    list = JSON.parse(text).browserslist
+  } else if (text.indexOf('"browserlist"') >= 0) {
+    var config = JSON.parse(text)
+    if (config.browserlist && !config.browserslist) {
+      throw new BrowserslistError(
+        '`browserlist` key instead of `browserslist` in ' + file
+      )
+    }
   }
-  var list = config.browserslist
   if (Array.isArray(list) || typeof list === 'string') {
     list = { defaults: list }
   }
@@ -126,11 +149,17 @@ function parsePackage(file) {
 }
 
 function parsePackageOrReadConfig(file) {
-  if (path.basename(file) === 'package.json') {
-    return parsePackage(file)
-  } else {
-    return module.exports.readConfig(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
+  }
+  return result
 }
 
 function latestReleaseTime(agents) {
@@ -200,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
@@ -234,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
-      })
+      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 {
@@ -340,81 +376,66 @@ module.exports = {
     if (!isFile(file)) {
       throw new BrowserslistError("Can't read " + file + ' config')
     }
+
     return module.exports.parseConfig(fs.readFileSync(file))
   },
 
   findConfigFile: function findConfigFile(from) {
-    var resolved = 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
-      }
-    })
 
-    return resolved
+        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) {
-    from = path.resolve(from)
-
-    var fromDir = isFile(from) ? path.dirname(from) : from
-    if (fromDir in configCache) {
-      return configCache[fromDir]
-    }
-
-    var resolved
     var configFile = this.findConfigFile(from)
-    if (configFile) {
-      resolved = parsePackageOrReadConfig(configFile)
-    }
 
-    if (!process.env.BROWSERSLIST_DISABLE_CACHE) {
-      var configDir = configFile && path.dirname(configFile)
-      eachParent(from, function (dir) {
-        configCache[dir] = resolved
-        if (dir === configDir) {
-          return null
-        }
-      })
-    }
-    return resolved
+    return configFile ? parsePackageOrReadConfig(configFile) : undefined
   },
 
   clearCaches: function clearCaches() {
     dataTimeChecked = false
-    filenessCache = {}
-    configCache = {}
+    statCache = {}
+    configPathCache = {}
+    parseConfigCache = {}
 
     this.cache = {}
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.24.3",
+  "version": "4.24.5",
   "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.30001716",
+    "electron-to-chromium": "^1.5.149",
     "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"