browserslist 4.17.5 → 4.19.0

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
@@ -78,10 +82,18 @@ function pickEnv (config, opts) {
     name = 'production'
   }
 
+  if (opts.throwOnMissing) {
+    if (name && name !== 'defaults' && !config[name]) {
+      throw new BrowserslistError(
+        'Missing config for Browserslist environment `' + name + '`'
+      )
+    }
+  }
+
   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 +111,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 +124,7 @@ function latestReleaseTime (agents) {
   return latest * 1000
 }
 
-function normalizeStats (data, stats) {
+function normalizeStats(data, stats) {
   if (!data) {
     data = {}
   }
@@ -122,16 +134,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 +149,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 +164,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 +178,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 +212,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 +235,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 +250,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 +264,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 +299,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 +361,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 +380,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.5",
+  "version": "4.19.0",
   "description": "Share target browsers between different front-end tools, like Autoprefixer, Stylelint and babel-env-preset",
   "keywords": [
     "caniuse",
@@ -15,8 +15,8 @@
   "license": "MIT",
   "repository": "browserslist/browserslist",
   "dependencies": {
-    "caniuse-lite": "^1.0.30001271",
-    "electron-to-chromium": "^1.3.878",
+    "caniuse-lite": "^1.0.30001286",
+    "electron-to-chromium": "^1.4.17",
     "escalade": "^3.1.1",
     "node-releases": "^2.0.1",
     "picocolors": "^1.0.0"
@@ -24,6 +24,7 @@
   "engines": {
     "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
   },
+  "packageManager": "pnpm@6.23.6",
   "bin": {
     "browserslist": "cli.js"
   },

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,33 @@ 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
-        ) : ''
+        if (lines.length === 4) {
+          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
@@ -165,6 +181,7 @@ function updatePnpmLockfile (lock, latest) {
     if (lines[i].indexOf('caniuse-lite:') >= 0) {
       lineParts = lines[i].split(/:\s?/, 2)
       if (lineParts[1].indexOf('/') >= 0) {
+        /* c8 ignore start */
         var sublineParts = lineParts[1].split(/([/:])/)
         for (j = 0; j < sublineParts.length; j++) {
           if (sublineParts[j].indexOf('caniuse-lite') >= 0) {
@@ -174,6 +191,7 @@ function updatePnpmLockfile (lock, latest) {
           }
         }
         lineParts[1] = sublineParts.join('')
+        /* c8 ignore stop */
       } else {
         versions[lineParts[1]] = true
       }
@@ -203,18 +221,19 @@ 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') {
-    return updateNpmLockfile(lock, latest)
-  } else if (lock.mode === 'yarn') {
+  if (lock.mode === 'yarn') {
     return updateYarnLockfile(lock, latest)
+  } else if (lock.mode === 'pnpm') {
+    return updatePnpmLockfile(lock, latest)
+  } else {
+    return updateNpmLockfile(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) {
@@ -248,7 +267,7 @@ function updatePackageManually (print, lock, latest) {
   )
   try {
     childProcess.execSync(install + ' caniuse-lite')
-  } catch (e) /* istanbul ignore next */ {
+  } catch (e) /* c8 ignore start */ {
     print(
       pico.red(
         '\n' +
@@ -261,7 +280,7 @@ function updatePackageManually (print, lock, latest) {
       )
     )
     process.exit(1)
-  }
+  } /* c8 ignore end */
 
   var del = lock.mode === 'yarn' ? 'yarn remove -W' : lock.mode + ' uninstall'
   print(
@@ -272,7 +291,28 @@ function updatePackageManually (print, lock, latest) {
   childProcess.execSync(del + ' caniuse-lite')
 }
 
-module.exports = function updateDB (print) {
+function updateWith(print, cmd) {
+  print('Updating caniuse-lite version\n' + pico.yellow('$ ' + cmd) + '\n')
+  try {
+    childProcess.execSync(cmd)
+  } catch (e) /* c8 ignore start */ {
+    print(pico.red(e.stdout.toString()))
+    print(
+      pico.red(
+        '\n' +
+          e.stack +
+          '\n\n' +
+          'Problem with `' +
+          cmd +
+          '` call. ' +
+          'Run it manually.\n'
+      )
+    )
+    process.exit(1)
+  } /* c8 ignore end */
+}
+
+module.exports = function updateDB(print) {
   var lock = detectLockfile()
   var latest = getLatestInfo(lock)
 
@@ -287,28 +327,7 @@ module.exports = function updateDB (print) {
   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'
-    )
-    try {
-      childProcess.execSync(update + ' caniuse-lite')
-    } catch (e) /* istanbul ignore next */ {
-      print(
-        pico.red(
-          '\n' +
-            e.stack +
-            '\n\n' +
-            'Problem with `' +
-            update +
-            ' caniuse-lite` call. ' +
-            'Run it manually.\n'
-        )
-      )
-      process.exit(1)
-    }
+    updateWith(print, 'yarn up -R caniuse-lite')
   } else {
     updatePackageManually(print, lock, latest)
   }
@@ -319,9 +338,9 @@ module.exports = function updateDB (print) {
   if (!browsersListRetrievalError) {
     try {
       currentBrowsersList = getBrowsersList()
-    } catch (e) /* istanbul ignore next */ {
+    } catch (e) /* c8 ignore start */ {
       browsersListRetrievalError = e
-    }
+    } /* c8 ignore end */
   }
 
   if (browsersListRetrievalError) {