browserslist 4.20.3 → 4.21.1

package/node.js

@@ -94,7 +94,12 @@ function pickEnv(config, opts) {
 }
 
 function parsePackage(file) {
-  var config = JSON.parse(fs.readFileSync(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
@@ -380,9 +385,9 @@ module.exports = {
     if (latest !== 0 && latest < halfYearAgo) {
       console.warn(
         'Browserslist: caniuse-lite is outdated. Please run:\n' +
-          '  npx browserslist@latest --update-db\n' +
+          '  npx update-browserslist-db@latest\n' +
           '  Why you should do it regularly: ' +
-          'https://github.com/browserslist/browserslist#browsers-data-updating'
+          'https://github.com/browserslist/update-db#readme'
       )
     }
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.20.3",
+  "version": "4.21.1",
   "description": "Share target browsers between different front-end tools, like Autoprefixer, Stylelint and babel-env-preset",
   "keywords": [
     "caniuse",
@@ -21,11 +21,10 @@
   "license": "MIT",
   "repository": "browserslist/browserslist",
   "dependencies": {
-    "caniuse-lite": "^1.0.30001332",
-    "electron-to-chromium": "^1.4.118",
-    "escalade": "^3.1.1",
-    "node-releases": "^2.0.3",
-    "picocolors": "^1.0.0"
+    "caniuse-lite": "^1.0.30001359",
+    "electron-to-chromium": "^1.4.172",
+    "node-releases": "^2.0.5",
+    "update-browserslist-db": "^1.0.4"
   },
   "engines": {
     "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"

package/parse.js

@@ -0,0 +1,78 @@
+var AND_REGEXP = /^\s+and\s+(.*)/i
+var OR_REGEXP = /^(?:,\s*|\s+or\s+)(.*)/i
+
+function flatten(array) {
+  if (!Array.isArray(array)) return [array]
+  return array.reduce(function (a, b) {
+    return a.concat(flatten(b))
+  }, [])
+}
+
+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)) {
+      return string.slice(0, -n)
+    }
+  }
+  return ''
+}
+
+function matchQuery(all, query) {
+  var node = { query: query }
+  if (query.indexOf('not ') === 0) {
+    node.not = true
+    query = query.slice(4)
+  }
+
+  for (var name in all) {
+    var type = all[name]
+    var match = query.match(type.regexp)
+    if (match) {
+      node.type = name
+      for (var i = 0; i < type.matches.length; i++) {
+        node[type.matches[i]] = match[i + 1]
+      }
+      return node
+    }
+  }
+
+  node.type = 'unknown'
+  return node
+}
+
+function matchBlock(all, string, qs) {
+  var node
+  return find(string, function (parsed, n, max) {
+    if (AND_REGEXP.test(parsed)) {
+      node = matchQuery(all, parsed.match(AND_REGEXP)[1])
+      node.compose = 'and'
+      qs.unshift(node)
+      return true
+    } else if (OR_REGEXP.test(parsed)) {
+      node = matchQuery(all, parsed.match(OR_REGEXP)[1])
+      node.compose = 'or'
+      qs.unshift(node)
+      return true
+    } else if (n === max) {
+      node = matchQuery(all, parsed.trim())
+      node.compose = 'or'
+      qs.unshift(node)
+      return true
+    }
+    return false
+  })
+}
+
+module.exports = function parse(all, queries) {
+  if (!Array.isArray(queries)) queries = [queries]
+  return flatten(
+    queries.map(function (block) {
+      var qs = []
+      do {
+        block = matchBlock(all, block, qs)
+      } while (block)
+      return qs
+    })
+  )
+}

package/update-db.js

@@ -1,317 +0,0 @@
-var childProcess = require('child_process')
-var escalade = require('escalade/sync')
-var pico = require('picocolors')
-var path = require('path')
-var fs = require('fs')
-
-var BrowserslistError = require('./error')
-
-function detectLockfile() {
-  var packageDir = escalade('.', function (dir, names) {
-    return names.indexOf('package.json') !== -1 ? dir : ''
-  })
-
-  if (!packageDir) {
-    throw new BrowserslistError(
-      'Cannot find package.json. ' +
-        'Is this the right directory to run `npx browserslist --update-db` in?'
-    )
-  }
-
-  var lockfileNpm = path.join(packageDir, 'package-lock.json')
-  var lockfileShrinkwrap = path.join(packageDir, 'npm-shrinkwrap.json')
-  var lockfileYarn = path.join(packageDir, 'yarn.lock')
-  var lockfilePnpm = path.join(packageDir, 'pnpm-lock.yaml')
-
-  if (fs.existsSync(lockfilePnpm)) {
-    return { mode: 'pnpm', file: lockfilePnpm }
-  } else if (fs.existsSync(lockfileNpm)) {
-    return { mode: 'npm', file: lockfileNpm }
-  } else if (fs.existsSync(lockfileYarn)) {
-    var lock = { mode: 'yarn', file: lockfileYarn }
-    lock.content = fs.readFileSync(lock.file).toString()
-    lock.version = /# yarn lockfile v1/.test(lock.content) ? 1 : 2
-    return lock
-  } else if (fs.existsSync(lockfileShrinkwrap)) {
-    return { mode: 'npm', file: lockfileShrinkwrap }
-  }
-  throw new BrowserslistError(
-    'No lockfile found. Run "npm install", "yarn install" or "pnpm install"'
-  )
-}
-
-function getLatestInfo(lock) {
-  if (lock.mode === 'yarn') {
-    if (lock.version === 1) {
-      return JSON.parse(
-        childProcess.execSync('yarn info caniuse-lite --json').toString()
-      ).data
-    } else {
-      return JSON.parse(
-        childProcess.execSync('yarn npm info caniuse-lite --json').toString()
-      )
-    }
-  }
-  return JSON.parse(
-    childProcess.execSync('npm show caniuse-lite --json').toString()
-  )
-}
-
-function getBrowsersList() {
-  return childProcess
-    .execSync('npx browserslist')
-    .toString()
-    .trim()
-    .split('\n')
-    .map(function (line) {
-      return line.trim().split(' ')
-    })
-    .reduce(function (result, entry) {
-      if (!result[entry[0]]) {
-        result[entry[0]] = []
-      }
-      result[entry[0]].push(entry[1])
-      return result
-    }, {})
-}
-
-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 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) {
-  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) {
-  if (node.dependencies) {
-    if (node.dependencies['caniuse-lite']) {
-      var version = node.dependencies['caniuse-lite'].version
-      metadata.versions[version] = true
-      delete node.dependencies['caniuse-lite']
-    }
-    for (var i in node.dependencies) {
-      node.dependencies[i] = deletePackage(node.dependencies[i], metadata)
-    }
-  }
-  return node
-}
-
-var yarnVersionRe = /version "(.*?)"/
-
-function updateYarnLockfile(lock, latest) {
-  var blocks = lock.content.split(/(\n{2,})/).map(function (block) {
-    return block.split('\n')
-  })
-  var versions = {}
-  blocks.forEach(function (lines) {
-    if (lines[0].indexOf('caniuse-lite@') !== -1) {
-      var match = yarnVersionRe.exec(lines[1])
-      versions[match[1]] = true
-      if (match[1] !== latest.version) {
-        lines[1] = lines[1].replace(
-          /version "[^"]+"/,
-          'version "' + latest.version + '"'
-        )
-        lines[2] = lines[2].replace(
-          /resolved "[^"]+"/,
-          'resolved "' + latest.dist.tarball + '"'
-        )
-        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('')
-  return { content: content, versions: versions }
-}
-
-function updateLockfile(lock, latest) {
-  if (!lock.content) lock.content = fs.readFileSync(lock.file).toString()
-
-  if (lock.mode === 'yarn') {
-    return updateYarnLockfile(lock, latest)
-  } else {
-    return updateNpmLockfile(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) {
-    print(
-      'Installed version:  ' +
-        pico.bold(pico.green(latest.version)) +
-        '\n' +
-        pico.bold(pico.green('caniuse-lite is up to date')) +
-        '\n'
-    )
-    return
-  }
-
-  if (caniuseVersions.length === 0) {
-    caniuseVersions[0] = 'none'
-  }
-  print(
-    'Installed version' +
-      (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'
-  )
-  try {
-    childProcess.execSync(install + ' caniuse-lite')
-  } catch (e) /* c8 ignore start */ {
-    print(
-      pico.red(
-        '\n' +
-          e.stack +
-          '\n\n' +
-          'Problem with `' +
-          install +
-          ' caniuse-lite` call. ' +
-          'Run it manually.\n'
-      )
-    )
-    process.exit(1)
-  } /* c8 ignore end */
-
-  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'
-  )
-  childProcess.execSync(del + ' caniuse-lite')
-}
-
-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)
-
-  var browsersListRetrievalError
-  var oldBrowsersList
-  try {
-    oldBrowsersList = getBrowsersList()
-  } catch (e) {
-    browsersListRetrievalError = e
-  }
-
-  print('Latest version:     ' + pico.bold(pico.green(latest.version)) + '\n')
-
-  if (lock.mode === 'yarn' && lock.version !== 1) {
-    updateWith(print, 'yarn up -R caniuse-lite')
-  } else if (lock.mode === 'pnpm') {
-    updateWith(print, 'pnpm up caniuse-lite')
-  } else {
-    updatePackageManually(print, lock, latest)
-  }
-
-  print('caniuse-lite has been successfully updated\n')
-
-  var currentBrowsersList
-  if (!browsersListRetrievalError) {
-    try {
-      currentBrowsersList = getBrowsersList()
-    } catch (e) /* c8 ignore start */ {
-      browsersListRetrievalError = e
-    } /* c8 ignore end */
-  }
-
-  if (browsersListRetrievalError) {
-    print(
-      pico.red(
-        '\n' +
-          browsersListRetrievalError.stack +
-          '\n\n' +
-          'Problem with browser list retrieval.\n' +
-          'Target browser changes won’t be shown.\n'
-      )
-    )
-  } else {
-    var targetBrowserChanges = diffBrowsersLists(
-      oldBrowsersList,
-      currentBrowsersList
-    )
-    if (targetBrowserChanges) {
-      print('\nTarget browser changes:\n')
-      print(targetBrowserChanges + '\n')
-    } else {
-      print('\n' + pico.green('No target browser changes') + '\n')
-    }
-  }
-}