browserslist 4.23.3 → 4.24.0

package/browser.js

@@ -44,6 +44,8 @@ module.exports = {
 
   findConfig: noop,
 
+  findConfigFile: noop,
+
   clearCaches: noop,
 
   oldDataWarning: noop,

package/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-var updateDb = require('update-browserslist-db')
 var fs = require('fs')
+var updateDb = require('update-browserslist-db')
 
 var browserslist = require('./')
 var pkg = require('./package.json')

package/index.d.ts

@@ -174,6 +174,8 @@ declare namespace browserslist {
 
   function findConfig(...pathSegments: string[]): Config | undefined
 
+  function findConfigFile(...pathSegments: string[]): string | undefined
+
   interface LoadConfigOptions {
     config?: string
     path?: string

package/index.js

@@ -1,12 +1,12 @@
 var jsReleases = require('node-releases/data/processed/envs.json')
 var agents = require('caniuse-lite/dist/unpacker/agents').agents
+var e2c = require('electron-to-chromium/versions')
 var jsEOL = require('node-releases/data/release-schedule/release-schedule.json')
 var path = require('path')
-var e2c = require('electron-to-chromium/versions')
 
 var BrowserslistError = require('./error')
-var parse = require('./parse')
-var env = require('./node') // Will load browser.js in webpack
+var env = require('./node')
+var parse = require('./parse') // Will load browser.js in webpack
 
 var YEAR = 365.259641 * 24 * 60 * 60 * 1000
 var ANDROID_EVERGREEN_FIRST = '37'
@@ -491,6 +491,7 @@ browserslist.versionAliases = {}
 browserslist.clearCaches = env.clearCaches
 browserslist.parseConfig = env.parseConfig
 browserslist.readConfig = env.readConfig
+browserslist.findConfigFile = env.findConfigFile
 browserslist.findConfig = env.findConfig
 browserslist.loadConfig = env.loadConfig
 

package/node.js

@@ -1,7 +1,7 @@
 var feature = require('caniuse-lite/dist/unpacker/feature').default
 var region = require('caniuse-lite/dist/unpacker/region').default
-var path = require('path')
 var fs = require('fs')
+var path = require('path')
 
 var BrowserslistError = require('./error')
 
@@ -126,6 +126,14 @@ function parsePackage(file) {
   return list
 }
 
+function parsePackageOrReadConfig(file) {
+  if (path.basename(file) === 'package.json') {
+    return parsePackage(file)
+  } else {
+    return module.exports.readConfig(file)
+  }
+}
+
 function latestReleaseTime(agents) {
   var latest = 0
   for (var name in agents) {
@@ -237,11 +245,7 @@ module.exports = {
       return process.env.BROWSERSLIST
     } else if (opts.config || process.env.BROWSERSLIST_CONFIG) {
       var file = opts.config || process.env.BROWSERSLIST_CONFIG
-      if (path.basename(file) === 'package.json') {
-        return pickEnv(parsePackage(file), opts)
-      } else {
-        return pickEnv(module.exports.readConfig(file), opts)
-      }
+      return pickEnv(parsePackageOrReadConfig(file), opts)
     } else if (opts.path) {
       return pickEnv(module.exports.findConfig(opts.path), opts)
     } else {
@@ -330,17 +334,8 @@ module.exports = {
     return module.exports.parseConfig(fs.readFileSync(file))
   },
 
-  findConfig: function findConfig(from) {
-    from = path.resolve(from)
-
-    var passed = []
+  findConfigFile: function findConfigFile(from) {
     var resolved = eachParent(from, function (dir) {
-      if (dir in configCache) {
-        return configCache[dir]
-      }
-
-      passed.push(dir)
-
       var config = path.join(dir, 'browserslist')
       var pkg = path.join(dir, 'package.json')
       var rc = path.join(dir, '.browserslistrc')
@@ -370,16 +365,38 @@ module.exports = {
           dir + ' contains both .browserslistrc and browserslist'
         )
       } else if (isFile(config)) {
-        return module.exports.readConfig(config)
+        return config
       } else if (isFile(rc)) {
-        return module.exports.readConfig(rc)
-      } else {
-        return pkgBrowserslist
+        return rc
+      } else if (pkgBrowserslist) {
+        return pkg
       }
     })
+
+    return resolved
+  },
+
+  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) {
-      passed.forEach(function (dir) {
+      var configDir = configFile && path.dirname(configFile)
+      eachParent(from, function (dir) {
         configCache[dir] = resolved
+        if (dir === configDir) {
+          return null
+        }
       })
     }
     return resolved

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.23.3",
+  "version": "4.24.0",
   "description": "Share target browsers between different front-end tools, like Autoprefixer, Stylelint and babel-env-preset",
   "keywords": [
     "caniuse",
@@ -25,8 +25,8 @@
   "license": "MIT",
   "repository": "browserslist/browserslist",
   "dependencies": {
-    "caniuse-lite": "^1.0.30001646",
-    "electron-to-chromium": "^1.5.4",
+    "caniuse-lite": "^1.0.30001663",
+    "electron-to-chromium": "^1.5.28",
     "node-releases": "^2.0.18",
     "update-browserslist-db": "^1.1.0"
   },

package/parse.js

@@ -9,7 +9,7 @@ function flatten(array) {
 }
 
 function find(string, predicate) {
-  for (var n = 1, max = string.length; n <= max; n++) {
+  for (var max = string.length, n = 1; n <= max; n++) {
     var parsed = string.substr(-n, n)
     if (predicate(parsed, n, max)) {
       return string.slice(0, -n)