browserslist 4.17.3 → 4.18.0

package/browser.js

@@ -1,36 +1,40 @@
 var BrowserslistError = require('./error')
 
-function noop () { }
+function noop() {}
 
 module.exports = {
-  loadQueries: function loadQueries () {
+  loadQueries: function loadQueries() {
     throw new BrowserslistError(
-      'Sharable configs are not supported in client-side build of Browserslist')
+      'Sharable configs are not supported in client-side build of Browserslist'
+    )
   },
 
-  getStat: function getStat (opts) {
+  getStat: function getStat(opts) {
     return opts.stats
   },
 
-  loadConfig: function loadConfig (opts) {
+  loadConfig: function loadConfig(opts) {
     if (opts.config) {
       throw new BrowserslistError(
-        'Browserslist config are not supported in client-side build')
+        'Browserslist config are not supported in client-side build'
+      )
     }
   },
 
-  loadCountry: function loadCountry () {
+  loadCountry: function loadCountry() {
     throw new BrowserslistError(
       'Country statistics are not supported ' +
-      'in client-side build of Browserslist')
+        'in client-side build of Browserslist'
+    )
   },
 
-  loadFeature: function loadFeature () {
+  loadFeature: function loadFeature() {
     throw new BrowserslistError(
-      'Supports queries are not available in client-side build of Browserslist')
+      'Supports queries are not available in client-side build of Browserslist'
+    )
   },
 
-  currentNode: function currentNode (resolve, context) {
+  currentNode: function currentNode(resolve, context) {
     return resolve(['maintained node versions'], context)[0]
   },
 

package/cli.js

@@ -8,26 +8,28 @@ var pkg = require('./package.json')
 
 var args = process.argv.slice(2)
 
-var USAGE = 'Usage:\n' +
-            '  npx browserslist\n' +
-            '  npx browserslist "QUERIES"\n' +
-            '  npx browserslist --json "QUERIES"\n' +
-            '  npx browserslist --config="path/to/browserlist/file"\n' +
-            '  npx browserslist --coverage "QUERIES"\n' +
-            '  npx browserslist --coverage=US "QUERIES"\n' +
-            '  npx browserslist --coverage=US,RU,global "QUERIES"\n' +
-            '  npx browserslist --env="environment name defined in config"\n' +
-            '  npx browserslist --stats="path/to/browserlist/stats/file"\n' +
-            '  npx browserslist --mobile-to-desktop\n' +
-            '  npx browserslist --update-db'
-
-function isArg (arg) {
+var USAGE =
+  'Usage:\n' +
+  '  npx browserslist\n' +
+  '  npx browserslist "QUERIES"\n' +
+  '  npx browserslist --json "QUERIES"\n' +
+  '  npx browserslist --config="path/to/browserlist/file"\n' +
+  '  npx browserslist --coverage "QUERIES"\n' +
+  '  npx browserslist --coverage=US "QUERIES"\n' +
+  '  npx browserslist --coverage=US,RU,global "QUERIES"\n' +
+  '  npx browserslist --env="environment name defined in config"\n' +
+  '  npx browserslist --stats="path/to/browserlist/stats/file"\n' +
+  '  npx browserslist --mobile-to-desktop\n' +
+  '  npx browserslist --ignore-unknown-versions' +
+  '  npx browserslist --update-db'
+
+function isArg(arg) {
   return args.some(function (str) {
     return str === arg || str.indexOf(arg + '=') === 0
   })
 }
 
-function error (msg) {
+function error(msg) {
   process.stderr.write('browserslist: ' + msg + '\n')
   process.exit(1)
 }
@@ -42,7 +44,7 @@ if (isArg('--help') || isArg('-h')) {
   })
 } else {
   var mode = 'browsers'
-  var opts = { }
+  var opts = {}
   var queries
   var areas
 
@@ -75,6 +77,8 @@ if (isArg('--help') || isArg('-h')) {
       mode = 'json'
     } else if (name === '--mobile-to-desktop') {
       opts.mobileToDesktop = true
+    } else if (name === '--ignore-unknown-versions') {
+      opts.ignoreUnknownVersions = true
     } else {
       error('Unknown arguments ' + args[i] + '.\n\n' + USAGE)
     }
@@ -138,7 +142,7 @@ if (isArg('--help') || isArg('-h')) {
       data.coverage = coverage.reduce(function (object, j) {
         object[j[0]] = j[1]
         return object
-      }, { })
+      }, {})
     }
     process.stdout.write(JSON.stringify(data, null, '  ') + '\n')
   }

package/error.d.ts

@@ -1,7 +1,7 @@
 declare class BrowserslistError extends Error {
-  constructor(message: any);
-  name: 'BrowserslistError';
-  browserslist: true;
+  constructor(message: any)
+  name: 'BrowserslistError'
+  browserslist: true
 }
 
-export = BrowserslistError;
+export = BrowserslistError

package/error.js

@@ -1,4 +1,4 @@
-function BrowserslistError (message) {
+function BrowserslistError(message) {
   this.name = 'BrowserslistError'
   this.message = message
   this.browserslist = true

package/index.d.ts

@@ -8,7 +8,7 @@
  * @param queries Browser queries.
  * @returns Array with browser names in Can I Use.
  */
-declare function browserslist (
+declare function browserslist(
   queries?: string | readonly string[] | null,
   opts?: browserslist.Options
 ): string[]
@@ -136,15 +136,15 @@ declare namespace browserslist {
    * @param stats Which statistics should be used.
    * @returns Total market coverage for all selected browsers.
    */
-  function coverage (browsers: readonly string[], stats?: StatsOptions): number
+  function coverage(browsers: readonly string[], stats?: StatsOptions): number
 
-  function clearCaches (): void
+  function clearCaches(): void
 
-  function parseConfig (string: string): Config
+  function parseConfig(string: string): Config
 
-  function readConfig (file: string): Config
+  function readConfig(file: string): Config
 
-  function findConfig (...pathSegments: string[]): Config | undefined
+  function findConfig(...pathSegments: string[]): Config | undefined
 
   interface LoadConfigOptions {
     config?: string
@@ -152,7 +152,7 @@ declare namespace browserslist {
     env?: string
   }
 
-  function loadConfig (options: LoadConfigOptions): string[] | undefined
+  function loadConfig(options: LoadConfigOptions): string[] | undefined
 }
 
 declare global {

package/index.js

@@ -13,45 +13,42 @@ var ANDROID_EVERGREEN_FIRST = 37
 var QUERY_OR = 1
 var QUERY_AND = 2
 
-function isVersionsMatch (versionA, versionB) {
+function isVersionsMatch(versionA, versionB) {
   return (versionA + '.').indexOf(versionB + '.') === 0
 }
 
-function isEolReleased (name) {
+function isEolReleased(name) {
   var version = name.slice(1)
   return jsReleases.some(function (i) {
     return isVersionsMatch(i.version, version)
   })
 }
 
-function normalize (versions) {
+function normalize(versions) {
   return versions.filter(function (version) {
     return typeof version === 'string'
   })
 }
 
-function normalizeElectron (version) {
+function normalizeElectron(version) {
   var versionToUse = version
   if (version.split('.').length === 3) {
-    versionToUse = version
-      .split('.')
-      .slice(0, -1)
-      .join('.')
+    versionToUse = version.split('.').slice(0, -1).join('.')
   }
   return versionToUse
 }
 
-function nameMapper (name) {
-  return function mapName (version) {
+function nameMapper(name) {
+  return function mapName(version) {
     return name + ' ' + version
   }
 }
 
-function getMajor (version) {
+function getMajor(version) {
   return parseInt(version.split('.')[0])
 }
 
-function getMajorVersions (released, number) {
+function getMajorVersions(released, number) {
   if (released.length === 0) return []
   var majorVersions = uniq(released.map(getMajor))
   var minimum = majorVersions[majorVersions.length - number]
@@ -66,7 +63,7 @@ function getMajorVersions (released, number) {
   return selected
 }
 
-function uniq (array) {
+function uniq(array) {
   var filtered = []
   for (var i = 0; i < array.length; i++) {
     if (filtered.indexOf(array[i]) === -1) filtered.push(array[i])
@@ -76,13 +73,13 @@ function uniq (array) {
 
 // Helpers
 
-function fillUsage (result, name, data) {
+function fillUsage(result, name, data) {
   for (var i in data) {
     result[name + ' ' + i] = data[i]
   }
 }
 
-function generateFilter (sign, version) {
+function generateFilter(sign, version) {
   version = parseFloat(version)
   if (sign === '>') {
     return function (v) {
@@ -103,7 +100,7 @@ function generateFilter (sign, version) {
   }
 }
 
-function generateSemverFilter (sign, version) {
+function generateSemverFilter(sign, version) {
   version = version.split('.').map(parseSimpleInt)
   version[1] = version[1] || 0
   version[2] = version[2] || 0
@@ -130,17 +127,17 @@ function generateSemverFilter (sign, version) {
   }
 }
 
-function parseSimpleInt (x) {
+function parseSimpleInt(x) {
   return parseInt(x)
 }
 
-function compare (a, b) {
+function compare(a, b) {
   if (a < b) return -1
   if (a > b) return +1
   return 0
 }
 
-function compareSemver (a, b) {
+function compareSemver(a, b) {
   return (
     compare(parseInt(a[0]), parseInt(b[0])) ||
     compare(parseInt(a[1] || '0'), parseInt(b[1] || '0')) ||
@@ -149,7 +146,7 @@ function compareSemver (a, b) {
 }
 
 // this follows the npm-like semver behavior
-function semverFilterLoose (operator, range) {
+function semverFilterLoose(operator, range) {
   range = range.split('.').map(parseSimpleInt)
   if (typeof range[1] === 'undefined') {
     range[1] = 'x'
@@ -162,8 +159,8 @@ function semverFilterLoose (operator, range) {
         version = version.split('.').map(parseSimpleInt)
         return compareSemverLoose(version, range) <= 0
       }
-    default:
     case '>=':
+    default:
       return function (version) {
         version = version.split('.').map(parseSimpleInt)
         return compareSemverLoose(version, range) >= 0
@@ -172,7 +169,7 @@ function semverFilterLoose (operator, range) {
 }
 
 // this follows the npm-like semver behavior
-function compareSemverLoose (version, range) {
+function compareSemverLoose(version, range) {
   if (version[0] !== range[0]) {
     return version[0] < range[0] ? -1 : +1
   }
@@ -185,7 +182,7 @@ function compareSemverLoose (version, range) {
   return 0
 }
 
-function resolveVersion (data, version) {
+function resolveVersion(data, version) {
   if (data.versions.indexOf(version) !== -1) {
     return version
   } else if (browserslist.versionAliases[data.name][version]) {
@@ -195,7 +192,7 @@ function resolveVersion (data, version) {
   }
 }
 
-function normalizeVersion (data, version) {
+function normalizeVersion(data, version) {
   var resolved = resolveVersion(data, version)
   if (resolved) {
     return resolved
@@ -206,7 +203,7 @@ function normalizeVersion (data, version) {
   }
 }
 
-function filterByYear (since, context) {
+function filterByYear(since, context) {
   since = since / 1000
   return Object.keys(agents).reduce(function (selected, name) {
     var data = byName(name, context)
@@ -218,7 +215,7 @@ function filterByYear (since, context) {
   }, [])
 }
 
-function cloneData (data) {
+function cloneData(data) {
   return {
     name: data.name,
     versions: data.versions,
@@ -227,14 +224,14 @@ function cloneData (data) {
   }
 }
 
-function mapVersions (data, map) {
+function mapVersions(data, map) {
   data.versions = data.versions.map(function (i) {
     return map[i] || i
   })
   data.released = data.versions.map(function (i) {
     return map[i] || i
   })
-  var fixedDate = { }
+  var fixedDate = {}
   for (var i in data.releaseDate) {
     fixedDate[map[i] || i] = data.releaseDate[i]
   }
@@ -242,7 +239,7 @@ function mapVersions (data, map) {
   return data
 }
 
-function byName (name, context) {
+function byName(name, context) {
   name = name.toLowerCase()
   name = browserslist.aliases[name] || name
   if (context.mobileToDesktop && browserslist.desktopNames[name]) {
@@ -261,34 +258,38 @@ function byName (name, context) {
   return browserslist.data[name]
 }
 
-function normalizeAndroidVersions (androidVersions, chromeVersions) {
+function normalizeAndroidVersions(androidVersions, chromeVersions) {
   var firstEvergreen = ANDROID_EVERGREEN_FIRST
   var last = chromeVersions[chromeVersions.length - 1]
   return androidVersions
-    .filter(function (version) { return /^(?:[2-4]\.|[34]$)/.test(version) })
+    .filter(function (version) {
+      return /^(?:[2-4]\.|[34]$)/.test(version)
+    })
     .concat(chromeVersions.slice(firstEvergreen - last - 1))
 }
 
-function normalizeAndroidData (android, chrome) {
+function normalizeAndroidData(android, chrome) {
   android.released = normalizeAndroidVersions(android.released, chrome.released)
   android.versions = normalizeAndroidVersions(android.versions, chrome.versions)
   return android
 }
 
-function checkName (name, context) {
+function checkName(name, context) {
   var data = byName(name, context)
   if (!data) throw new BrowserslistError('Unknown browser ' + name)
   return data
 }
 
-function unknownQuery (query) {
+function unknownQuery(query) {
   return new BrowserslistError(
-    'Unknown browser query `' + query + '`. ' +
-    'Maybe you are using old Browserslist or made typo in query.'
+    'Unknown browser query `' +
+      query +
+      '`. ' +
+      'Maybe you are using old Browserslist or made typo in query.'
   )
 }
 
-function filterAndroid (list, versions, context) {
+function filterAndroid(list, versions, context) {
   if (context.mobileToDesktop) return list
   var released = browserslist.data.android.released
   var last = released[released.length - 1]
@@ -308,7 +309,7 @@ function filterAndroid (list, versions, context) {
  * the select function in `queries`.
  * @returns {string[]} A list of browsers
  */
-function resolve (queries, context) {
+function resolve(queries, context) {
   if (Array.isArray(queries)) {
     queries = flatten(queries.map(parse))
   } else {
@@ -323,7 +324,10 @@ function resolve (queries, context) {
       if (index === 0) {
         throw new BrowserslistError(
           'Write any browsers query (for instance, `defaults`) ' +
-          'before `' + selection + '`')
+            'before `' +
+            selection +
+            '`'
+        )
       }
       selection = selection.slice(4)
     }
@@ -356,7 +360,7 @@ function resolve (queries, context) {
           case QUERY_OR:
           default:
             if (isExclude) {
-              var filter = { }
+              var filter = {}
               array.forEach(function (j) {
                 filter[j] = true
               })
@@ -373,7 +377,7 @@ function resolve (queries, context) {
   }, [])
 }
 
-var cache = { }
+var cache = {}
 
 /**
  * Return array of browsers by selection queries.
@@ -400,8 +404,8 @@ var cache = { }
  * @example
  * browserslist('IE >= 10, IE 8') //=> ['ie 11', 'ie 10', 'ie 8']
  */
-function browserslist (queries, opts) {
-  if (typeof opts === 'undefined') opts = { }
+function browserslist(queries, opts) {
+  if (typeof opts === 'undefined') opts = {}
 
   if (typeof opts.path === 'undefined') {
     opts.path = path.resolve ? path.resolve('.') : '.'
@@ -418,7 +422,8 @@ function browserslist (queries, opts) {
 
   if (!(typeof queries === 'string' || Array.isArray(queries))) {
     throw new BrowserslistError(
-      'Browser queries must be an array or string. Got ' + typeof queries + '.')
+      'Browser queries must be an array or string. Got ' + typeof queries + '.'
+    )
   }
 
   var context = {
@@ -432,7 +437,7 @@ function browserslist (queries, opts) {
   env.oldDataWarning(browserslist.data)
   var stats = env.getStat(opts, browserslist.data)
   if (stats) {
-    context.customUsage = { }
+    context.customUsage = {}
     for (var browser in stats) {
       fillUsage(context.customUsage, browser, stats[browser])
     }
@@ -461,7 +466,7 @@ function browserslist (queries, opts) {
   return result
 }
 
-function parse (queries) {
+function parse(queries) {
   var qs = []
   do {
     queries = doMatch(queries, qs)
@@ -469,7 +474,7 @@ function parse (queries) {
   return qs
 }
 
-function doMatch (string, qs) {
+function doMatch(string, qs) {
   var or = /^(?:,\s*|\s+or\s+)(.*)/i
   var and = /^\s+and\s+(.*)/i
 
@@ -488,7 +493,7 @@ function doMatch (string, qs) {
   })
 }
 
-function find (string, predicate) {
+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)) {
@@ -498,7 +503,7 @@ function find (string, predicate) {
   return ''
 }
 
-function flatten (array) {
+function flatten(array) {
   if (!Array.isArray(array)) return [array]
   return array.reduce(function (a, b) {
     return a.concat(flatten(b))
@@ -506,20 +511,15 @@ function flatten (array) {
 }
 
 // Will be filled by Can I Use data below
-browserslist.cache = { }
-browserslist.data = { }
+browserslist.cache = {}
+browserslist.data = {}
 browserslist.usage = {
-  global: { },
+  global: {},
   custom: null
 }
 
 // Default browsers query
-browserslist.defaults = [
-  '> 0.5%',
-  'last 2 versions',
-  'Firefox ESR',
-  'not dead'
-]
+browserslist.defaults = ['> 0.5%', 'last 2 versions', 'Firefox ESR', 'not dead']
 
 // Browser names aliases
 browserslist.aliases = {
@@ -548,7 +548,7 @@ browserslist.desktopNames = {
 }
 
 // Aliases to work with joined versions like `ios_saf 7.0-7.1`
-browserslist.versionAliases = { }
+browserslist.versionAliases = {}
 
 browserslist.clearCaches = env.clearCaches
 browserslist.parseConfig = env.parseConfig
@@ -597,7 +597,7 @@ browserslist.coverage = function (browsers, stats) {
     if ('dataByBrowser' in stats) {
       stats = stats.dataByBrowser
     }
-    data = { }
+    data = {}
     for (var name in stats) {
       for (var version in stats[name]) {
         data[name + ' ' + version] = stats[name][version]
@@ -614,7 +614,7 @@ browserslist.coverage = function (browsers, stats) {
   }, 0)
 }
 
-function nodeQuery (context, version) {
+function nodeQuery(context, version) {
   var nodeReleases = jsReleases.filter(function (i) {
     return i.name === 'nodejs'
   })
@@ -631,22 +631,20 @@ function nodeQuery (context, version) {
   return ['node ' + matched[matched.length - 1].version]
 }
 
-function sinceQuery (context, year, month, date) {
+function sinceQuery(context, year, month, date) {
   year = parseInt(year)
   month = parseInt(month || '01') - 1
   date = parseInt(date || '01')
   return filterByYear(Date.UTC(year, month, date, 0, 0, 0), context)
 }
 
-function coverQuery (context, coverage, statMode) {
+function coverQuery(context, coverage, statMode) {
   coverage = parseFloat(coverage)
   var usage = browserslist.usage.global
   if (statMode) {
     if (statMode.match(/^my\s+stats$/)) {
       if (!context.customUsage) {
-        throw new BrowserslistError(
-          'Custom usage statistics was not provided'
-        )
+        throw new BrowserslistError('Custom usage statistics was not provided')
       }
       usage = context.customUsage
     } else {
@@ -986,7 +984,7 @@ var QUERIES = [
       var data = checkName(name, context)
       from = parseFloat(normalizeVersion(data, from) || from)
       to = parseFloat(normalizeVersion(data, to) || to)
-      function filter (v) {
+      function filter(v) {
         var parsed = parseFloat(v)
         return parsed >= from && parsed <= to
       }
@@ -1180,11 +1178,11 @@ var QUERIES = [
       }
     }
   }
-];
+]
 
 // Get and convert Can I Use data
 
-(function () {
+;(function () {
   for (var name in agents) {
     var browser = agents[name]
     browserslist.data[name] = {
@@ -1195,7 +1193,7 @@ var QUERIES = [
     }
     fillUsage(browserslist.usage.global, name, browser.usage_global)
 
-    browserslist.versionAliases[name] = { }
+    browserslist.versionAliases[name] = {}
     for (var i = 0; i < browser.versions.length; i++) {
       var full = browser.versions[i]
       if (!full) continue
@@ -1210,6 +1208,6 @@ var QUERIES = [
   }
 
   browserslist.versionAliases.op_mob['59'] = '58'
-}())
+})()
 
 module.exports = browserslist

package/node.js

@@ -9,29 +9,33 @@ var IS_SECTION = /^\s*\[(.+)]\s*$/
 var 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'
+var FORMAT =
+  'Browserslist config should be a string or an array ' +
+  'of strings with browser queries'
 
 var dataTimeChecked = false
-var filenessCache = { }
-var configCache = { }
-function checkExtend (name) {
+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)
+      'Browserslist config needs `browserslist-config-` prefix. ' + use
+    )
   }
   if (name.replace(/^@[^/]+\//, '').indexOf('.') !== -1) {
     throw new BrowserslistError(
-      '`.` not allowed in Browserslist config name. ' + use)
+      '`.` not allowed in Browserslist config name. ' + use
+    )
   }
   if (name.indexOf('node_modules') !== -1) {
     throw new BrowserslistError(
-      '`node_modules` not allowed in Browserslist config.' + use)
+      '`node_modules` not allowed in Browserslist config.' + use
+    )
   }
 }
 
-function isFile (file) {
+function isFile(file) {
   if (file in filenessCache) {
     return filenessCache[file]
   }
@@ -42,7 +46,7 @@ function isFile (file) {
   return result
 }
 
-function eachParent (file, callback) {
+function eachParent(file, callback) {
   var dir = isFile(file) ? path.dirname(file) : file
   var loc = path.resolve(dir)
   do {
@@ -52,7 +56,7 @@ function eachParent (file, callback) {
   return undefined
 }
 
-function check (section) {
+function check(section) {
   if (Array.isArray(section)) {
     for (var i = 0; i < section.length; i++) {
       if (typeof section[i] !== 'string') {
@@ -64,7 +68,7 @@ function check (section) {
   }
 }
 
-function pickEnv (config, opts) {
+function pickEnv(config, opts) {
   if (typeof config !== 'object') return config
 
   var name
@@ -81,7 +85,7 @@ function pickEnv (config, opts) {
   return config[name] || config.defaults
 }
 
-function parsePackage (file) {
+function parsePackage(file) {
   var config = JSON.parse(fs.readFileSync(file))
   if (config.browserlist && !config.browserslist) {
     throw new BrowserslistError(
@@ -99,10 +103,10 @@ function parsePackage (file) {
   return list
 }
 
-function latestReleaseTime (agents) {
+function latestReleaseTime(agents) {
   var latest = 0
   for (var name in agents) {
-    var dates = agents[name].releaseDate || { }
+    var dates = agents[name].releaseDate || {}
     for (var key in dates) {
       if (latest < dates[key]) {
         latest = dates[key]
@@ -112,7 +116,7 @@ function latestReleaseTime (agents) {
   return latest * 1000
 }
 
-function normalizeStats (data, stats) {
+function normalizeStats(data, stats) {
   if (!data) {
     data = {}
   }
@@ -122,16 +126,12 @@ function normalizeStats (data, stats) {
 
   if (typeof stats !== 'object') return undefined
 
-  var normalized = { }
+  var normalized = {}
   for (var i in stats) {
     var versions = Object.keys(stats[i])
-    if (
-      versions.length === 1 &&
-      data[i] &&
-      data[i].versions.length === 1
-    ) {
+    if (versions.length === 1 && data[i] && data[i].versions.length === 1) {
       var normal = data[i].versions[0]
-      normalized[i] = { }
+      normalized[i] = {}
       normalized[i][normal] = stats[i][versions[0]]
     } else {
       normalized[i] = stats[i]
@@ -141,7 +141,7 @@ function normalizeStats (data, stats) {
   return normalized
 }
 
-function normalizeUsageData (usageData, data) {
+function normalizeUsageData(usageData, data) {
   for (var browser in usageData) {
     var browserUsage = usageData[browser]
     // eslint-disable-next-line max-len
@@ -156,12 +156,11 @@ function normalizeUsageData (usageData, data) {
 }
 
 module.exports = {
-  loadQueries: function loadQueries (ctx, name) {
+  loadQueries: function loadQueries(ctx, name) {
     if (!ctx.dangerousExtend && !process.env.BROWSERSLIST_DANGEROUS_EXTEND) {
       checkExtend(name)
     }
-    // eslint-disable-next-line security/detect-non-literal-require
-    var queries = require(require.resolve(name, { paths: ['.'] }))
+    var queries = require(require.resolve(name, { paths: ['.', ctx.path] }))
     if (queries) {
       if (Array.isArray(queries)) {
         return queries
@@ -171,26 +170,25 @@ module.exports = {
       }
     }
     throw new BrowserslistError(
-      '`' + name + '` config exports not an array of queries' +
-      ' or an object of envs'
+      '`' +
+        name +
+        '` config exports not an array of queries' +
+        ' or an object of envs'
     )
   },
 
-  loadStat: function loadStat (ctx, name, data) {
+  loadStat: function loadStat(ctx, name, data) {
     if (!ctx.dangerousExtend && !process.env.BROWSERSLIST_DANGEROUS_EXTEND) {
       checkExtend(name)
     }
-    // eslint-disable-next-line security/detect-non-literal-require
-    var stats = require(
-      require.resolve(
-        path.join(name, 'browserslist-stats.json'),
-        { paths: ['.'] }
-      )
-    )
+    var stats = require(require.resolve(
+      path.join(name, 'browserslist-stats.json'),
+      { paths: ['.'] }
+    ))
     return normalizeStats(data, stats)
   },
 
-  getStat: function getStat (opts, data) {
+  getStat: function getStat(opts, data) {
     var stats
     if (opts.stats) {
       stats = opts.stats
@@ -206,13 +204,13 @@ module.exports = {
       try {
         stats = JSON.parse(fs.readFileSync(stats))
       } catch (e) {
-        throw new BrowserslistError('Can\'t read ' + stats)
+        throw new BrowserslistError("Can't read " + stats)
       }
     }
     return normalizeStats(data, stats)
   },
 
-  loadConfig: function loadConfig (opts) {
+  loadConfig: function loadConfig(opts) {
     if (process.env.BROWSERSLIST) {
       return process.env.BROWSERSLIST
     } else if (opts.config || process.env.BROWSERSLIST_CONFIG) {
@@ -229,14 +227,13 @@ module.exports = {
     }
   },
 
-  loadCountry: function loadCountry (usage, country, data) {
+  loadCountry: function loadCountry(usage, country, data) {
     var code = country.replace(/[^\w-]/g, '')
     if (!usage[code]) {
-      // eslint-disable-next-line security/detect-non-literal-require
       var compressed = require('caniuse-lite/data/regions/' + code + '.js')
       var usageData = region(compressed)
       normalizeUsageData(usageData, data)
-      usage[country] = { }
+      usage[country] = {}
       for (var i in usageData) {
         for (var j in usageData[i]) {
           usage[country][i + ' ' + j] = usageData[i][j]
@@ -245,14 +242,13 @@ module.exports = {
     }
   },
 
-  loadFeature: function loadFeature (features, name) {
+  loadFeature: function loadFeature(features, name) {
     name = name.replace(/[^\w-]/g, '')
     if (features[name]) return
 
-    // eslint-disable-next-line security/detect-non-literal-require
     var compressed = require('caniuse-lite/data/features/' + name + '.js')
     var stats = feature(compressed).stats
-    features[name] = { }
+    features[name] = {}
     for (var i in stats) {
       for (var j in stats[i]) {
         features[name][i + ' ' + j] = stats[i][j]
@@ -260,11 +256,12 @@ module.exports = {
     }
   },
 
-  parseConfig: function parseConfig (string) {
+  parseConfig: function parseConfig(string) {
     var result = { defaults: [] }
     var sections = ['defaults']
 
-    string.toString()
+    string
+      .toString()
       .replace(/#[^\n]*/g, '')
       .split(/\n|,/)
       .map(function (line) {
@@ -294,14 +291,14 @@ module.exports = {
     return result
   },
 
-  readConfig: function readConfig (file) {
+  readConfig: function readConfig(file) {
     if (!isFile(file)) {
-      throw new BrowserslistError('Can\'t read ' + file + ' config')
+      throw new BrowserslistError("Can't read " + file + ' config')
     }
     return module.exports.parseConfig(fs.readFileSync(file))
   },
 
-  findConfig: function findConfig (from) {
+  findConfig: function findConfig(from) {
     from = path.resolve(from)
 
     var passed = []
@@ -356,15 +353,15 @@ module.exports = {
     return resolved
   },
 
-  clearCaches: function clearCaches () {
+  clearCaches: function clearCaches() {
     dataTimeChecked = false
-    filenessCache = { }
-    configCache = { }
+    filenessCache = {}
+    configCache = {}
 
-    this.cache = { }
+    this.cache = {}
   },
 
-  oldDataWarning: function oldDataWarning (agentsObj) {
+  oldDataWarning: function oldDataWarning(agentsObj) {
     if (dataTimeChecked) return
     dataTimeChecked = true
     if (process.env.BROWSERSLIST_IGNORE_OLD_DATA) return
@@ -375,14 +372,14 @@ module.exports = {
     if (latest !== 0 && latest < halfYearAgo) {
       console.warn(
         'Browserslist: caniuse-lite is outdated. Please run:\n' +
-        '  npx browserslist@latest --update-db\n' +
-        '  Why you should do it regularly: ' +
-        'https://github.com/browserslist/browserslist#browsers-data-updating'
+          '  npx browserslist@latest --update-db\n' +
+          '  Why you should do it regularly: ' +
+          'https://github.com/browserslist/browserslist#browsers-data-updating'
       )
     }
   },
 
-  currentNode: function currentNode () {
+  currentNode: function currentNode() {
     return 'node ' + process.versions.node
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.17.3",
+  "version": "4.18.0",
   "description": "Share target browsers between different front-end tools, like Autoprefixer, Stylelint and babel-env-preset",
   "keywords": [
     "caniuse",
@@ -15,11 +15,11 @@
   "license": "MIT",
   "repository": "browserslist/browserslist",
   "dependencies": {
-    "caniuse-lite": "^1.0.30001264",
-    "electron-to-chromium": "^1.3.857",
+    "caniuse-lite": "^1.0.30001280",
+    "electron-to-chromium": "^1.3.896",
     "escalade": "^3.1.1",
-    "node-releases": "^1.1.77",
-    "picocolors": "^0.2.1"
+    "node-releases": "^2.0.1",
+    "picocolors": "^1.0.0"
   },
   "engines": {
     "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"

package/update-db.js

@@ -6,7 +6,7 @@ var fs = require('fs')
 
 var BrowserslistError = require('./error')
 
-function detectLockfile () {
+function detectLockfile() {
   var packageDir = escalade('.', function (dir, names) {
     return names.indexOf('package.json') !== -1 ? dir : ''
   })
@@ -14,7 +14,7 @@ function detectLockfile () {
   if (!packageDir) {
     throw new BrowserslistError(
       'Cannot find package.json. ' +
-      'Is this the right directory to run `npx browserslist --update-db` in?'
+        'Is this the right directory to run `npx browserslist --update-db` in?'
     )
   }
 
@@ -40,7 +40,7 @@ function detectLockfile () {
   )
 }
 
-function getLatestInfo (lock) {
+function getLatestInfo(lock) {
   if (lock.mode === 'yarn') {
     if (lock.version === 1) {
       return JSON.parse(
@@ -57,8 +57,10 @@ function getLatestInfo (lock) {
   )
 }
 
-function getBrowsersList () {
-  return childProcess.execSync('npx browserslist').toString()
+function getBrowsersList() {
+  return childProcess
+    .execSync('npx browserslist')
+    .toString()
     .trim()
     .split('\n')
     .map(function (line) {
@@ -73,44 +75,49 @@ function getBrowsersList () {
     }, {})
 }
 
-function diffBrowsersLists (old, current) {
+function diffBrowsersLists(old, current) {
   var browsers = Object.keys(old).concat(
     Object.keys(current).filter(function (browser) {
       return old[browser] === undefined
     })
   )
-  return browsers.map(function (browser) {
-    var oldVersions = old[browser] || []
-    var currentVersions = current[browser] || []
-    var intersection = oldVersions.filter(function (version) {
-      return currentVersions.indexOf(version) !== -1
-    })
-    var addedVersions = currentVersions.filter(function (version) {
-      return intersection.indexOf(version) === -1
-    })
-    var removedVersions = oldVersions.filter(function (version) {
-      return intersection.indexOf(version) === -1
+  return browsers
+    .map(function (browser) {
+      var oldVersions = old[browser] || []
+      var currentVersions = current[browser] || []
+      var intersection = oldVersions.filter(function (version) {
+        return currentVersions.indexOf(version) !== -1
+      })
+      var addedVersions = currentVersions.filter(function (version) {
+        return intersection.indexOf(version) === -1
+      })
+      var removedVersions = oldVersions.filter(function (version) {
+        return intersection.indexOf(version) === -1
+      })
+      return removedVersions
+        .map(function (version) {
+          return pico.red('- ' + browser + ' ' + version)
+        })
+        .concat(
+          addedVersions.map(function (version) {
+            return pico.green('+ ' + browser + ' ' + version)
+          })
+        )
     })
-    return removedVersions.map(function (version) {
-      return pico.red('- ' + browser + ' ' + version)
-    }).concat(addedVersions.map(function (version) {
-      return pico.green('+ ' + browser + ' ' + version)
-    }))
-  })
     .reduce(function (result, array) {
       return result.concat(array)
     }, [])
     .join('\n')
 }
 
-function updateNpmLockfile (lock, latest) {
+function updateNpmLockfile(lock, latest) {
   var metadata = { latest: latest, versions: [] }
   var content = deletePackage(JSON.parse(lock.content), metadata)
   metadata.content = JSON.stringify(content, null, '  ')
   return metadata
 }
 
-function deletePackage (node, metadata) {
+function deletePackage(node, metadata) {
   if (node.dependencies) {
     if (node.dependencies['caniuse-lite']) {
       var version = node.dependencies['caniuse-lite'].version
@@ -124,9 +131,9 @@ function deletePackage (node, metadata) {
   return node
 }
 
-var yarnVersionRe = new RegExp('version "(.*?)"')
+var yarnVersionRe = /version "(.*?)"/
 
-function updateYarnLockfile (lock, latest) {
+function updateYarnLockfile(lock, latest) {
   var blocks = lock.content.split(/(\n{2,})/).map(function (block) {
     return block.split('\n')
   })
@@ -137,24 +144,31 @@ function updateYarnLockfile (lock, latest) {
       versions[match[1]] = true
       if (match[1] !== latest.version) {
         lines[1] = lines[1].replace(
-          /version "[^"]+"/, 'version "' + latest.version + '"'
+          /version "[^"]+"/,
+          'version "' + latest.version + '"'
         )
         lines[2] = lines[2].replace(
-          /resolved "[^"]+"/, 'resolved "' + latest.dist.tarball + '"'
+          /resolved "[^"]+"/,
+          'resolved "' + latest.dist.tarball + '"'
         )
-        lines[3] = latest.dist.integrity ? lines[3].replace(
-          /integrity .+/, 'integrity ' + latest.dist.integrity
-        ) : ''
+        lines[3] = latest.dist.integrity
+          ? lines[3].replace(
+              /integrity .+/,
+              'integrity ' + latest.dist.integrity
+            )
+          : ''
       }
     }
   })
-  var content = blocks.map(function (lines) {
-    return lines.join('\n')
-  }).join('')
+  var content = blocks
+    .map(function (lines) {
+      return lines.join('\n')
+    })
+    .join('')
   return { content: content, versions: versions }
 }
 
-function updatePnpmLockfile (lock, latest) {
+function updatePnpmLockfile(lock, latest) {
   var versions = {}
   var lines = lock.content.split('\n')
   var i
@@ -164,7 +178,19 @@ function updatePnpmLockfile (lock, latest) {
   for (i = 0; i < lines.length; i++) {
     if (lines[i].indexOf('caniuse-lite:') >= 0) {
       lineParts = lines[i].split(/:\s?/, 2)
-      versions[lineParts[1]] = true
+      if (lineParts[1].indexOf('/') >= 0) {
+        var sublineParts = lineParts[1].split(/([/:])/)
+        for (j = 0; j < sublineParts.length; j++) {
+          if (sublineParts[j].indexOf('caniuse-lite') >= 0) {
+            versions[sublineParts[j + 2]] = true
+            sublineParts[j + 2] = latest.version
+            break
+          }
+        }
+        lineParts[1] = sublineParts.join('')
+      } else {
+        versions[lineParts[1]] = true
+      }
       lines[i] = lineParts[0] + ': ' + latest.version
     } else if (lines[i].indexOf('/caniuse-lite') >= 0) {
       lineParts = lines[i].split(/([/:])/)
@@ -179,7 +205,8 @@ function updatePnpmLockfile (lock, latest) {
       for (i = i + 1; i < lines.length; i++) {
         if (lines[i].indexOf('integrity: ') !== -1) {
           lines[i] = lines[i].replace(
-            /integrity: .+/, 'integrity: ' + latest.dist.integrity
+            /integrity: .+/,
+            'integrity: ' + latest.dist.integrity
           )
         } else if (lines[i].indexOf(' /') !== -1) {
           break
@@ -190,7 +217,7 @@ function updatePnpmLockfile (lock, latest) {
   return { content: lines.join('\n'), versions: versions }
 }
 
-function updateLockfile (lock, latest) {
+function updateLockfile(lock, latest) {
   if (!lock.content) lock.content = fs.readFileSync(lock.file).toString()
 
   if (lock.mode === 'npm') {
@@ -201,14 +228,16 @@ function updateLockfile (lock, latest) {
   return updatePnpmLockfile(lock, latest)
 }
 
-function updatePackageManually (print, lock, latest) {
+function updatePackageManually(print, lock, latest) {
   var lockfileData = updateLockfile(lock, latest)
   var caniuseVersions = Object.keys(lockfileData.versions).sort()
-  if (caniuseVersions.length === 1 &&
-    caniuseVersions[0] === latest.version) {
+  if (caniuseVersions.length === 1 && caniuseVersions[0] === latest.version) {
     print(
-      'Installed version:  ' + pico.bold(pico.green(latest.version)) + '\n' +
-      pico.bold(pico.green('caniuse-lite is up to date')) + '\n'
+      'Installed version:  ' +
+        pico.bold(pico.green(latest.version)) +
+        '\n' +
+        pico.bold(pico.green('caniuse-lite is up to date')) +
+        '\n'
     )
     return
   }
@@ -218,17 +247,18 @@ function updatePackageManually (print, lock, latest) {
   }
   print(
     'Installed version' +
-    (caniuseVersions.length === 1 ? ':  ' : 's: ') +
-    pico.bold(pico.red(caniuseVersions.join(', '))) +
-    '\n' +
-    'Removing old caniuse-lite from lock file\n'
+      (caniuseVersions.length === 1 ? ':  ' : 's: ') +
+      pico.bold(pico.red(caniuseVersions.join(', '))) +
+      '\n' +
+      'Removing old caniuse-lite from lock file\n'
   )
   fs.writeFileSync(lock.file, lockfileData.content)
 
   var install = lock.mode === 'yarn' ? 'yarn add -W' : lock.mode + ' install'
   print(
     'Installing new caniuse-lite version\n' +
-    pico.yellow('$ ' + install + ' caniuse-lite') + '\n'
+      pico.yellow('$ ' + install + ' caniuse-lite') +
+      '\n'
   )
   try {
     childProcess.execSync(install + ' caniuse-lite')
@@ -236,9 +266,12 @@ function updatePackageManually (print, lock, latest) {
     print(
       pico.red(
         '\n' +
-        e.stack + '\n\n' +
-        'Problem with `' + install + ' caniuse-lite` call. ' +
-        'Run it manually.\n'
+          e.stack +
+          '\n\n' +
+          'Problem with `' +
+          install +
+          ' caniuse-lite` call. ' +
+          'Run it manually.\n'
       )
     )
     process.exit(1)
@@ -247,12 +280,13 @@ function updatePackageManually (print, lock, latest) {
   var del = lock.mode === 'yarn' ? 'yarn remove -W' : lock.mode + ' uninstall'
   print(
     'Cleaning package.json dependencies from caniuse-lite\n' +
-    pico.yellow('$ ' + del + ' caniuse-lite') + '\n'
+      pico.yellow('$ ' + del + ' caniuse-lite') +
+      '\n'
   )
   childProcess.execSync(del + ' caniuse-lite')
 }
 
-module.exports = function updateDB (print) {
+module.exports = function updateDB(print) {
   var lock = detectLockfile()
   var latest = getLatestInfo(lock)
 
@@ -264,15 +298,14 @@ module.exports = function updateDB (print) {
     browsersListRetrievalError = e
   }
 
-  print(
-    'Latest version:     ' + pico.bold(pico.green(latest.version)) + '\n'
-  )
+  print('Latest version:     ' + pico.bold(pico.green(latest.version)) + '\n')
 
   if (lock.mode === 'yarn' && lock.version !== 1) {
     var update = 'yarn up -R'
     print(
       'Updating caniuse-lite version\n' +
-      pico.yellow('$ ' + update + ' caniuse-lite') + '\n'
+        pico.yellow('$ ' + update + ' caniuse-lite') +
+        '\n'
     )
     try {
       childProcess.execSync(update + ' caniuse-lite')
@@ -280,9 +313,12 @@ module.exports = function updateDB (print) {
       print(
         pico.red(
           '\n' +
-          e.stack + '\n\n' +
-          'Problem with `' + update + ' caniuse-lite` call. ' +
-          'Run it manually.\n'
+            e.stack +
+            '\n\n' +
+            'Problem with `' +
+            update +
+            ' caniuse-lite` call. ' +
+            'Run it manually.\n'
         )
       )
       process.exit(1)
@@ -306,9 +342,10 @@ module.exports = function updateDB (print) {
     print(
       pico.red(
         '\n' +
-        browsersListRetrievalError.stack + '\n\n' +
-        'Problem with browser list retrieval.\n' +
-        'Target browser changes won’t be shown.\n'
+          browsersListRetrievalError.stack +
+          '\n\n' +
+          'Problem with browser list retrieval.\n' +
+          'Target browser changes won’t be shown.\n'
       )
     )
   } else {