browserslist 4.8.7 → 4.11.0

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 4.11
+* Add `npx browserslist --mobile-to-desktop` (by James Ross).
+
+## 4.10
+* Add `npx browserslist --update-db` (by Ivan Solovev).
+
+## 4.9.1
+* Normalize incorrect Can I Use regional data (by Huáng Jùnliàng).
+
+## 4.9
+* Add `node X-Y` query support (by Yuping Zuo).
+
 ## 4.8.7
 * Fix `last N major versions` (by Valeriy Trubachev).
 

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright 2014 Andrey Sitnik <andrey@sitnik.ru>
+Copyright 2014 Andrey Sitnik <andrey@sitnik.ru> and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

package/README.md

@@ -37,7 +37,7 @@ not IE_Mob 11
 maintained node versions
 ```
 
-Developers set their version lists using queries like `last 2 version`
+Developers set their version lists using queries like `last 2 versions`
 to be free from updating versions manually.
 Browserslist will use [`caniuse-lite`] with [Can I Use] data for this queries.
 
@@ -91,12 +91,14 @@ Browserslist will take queries from tool option,
   by user agent string to match Browserslist.
 * [`browserslist-browserstack`] runs BrowserStack tests for all browsers
   in Browserslist config.
+* [`browserslist-adobe-analytics`] use Adobe Analytics data to target browsers.
 * [`caniuse-api`] returns browsers which support some specific feature.
 * Run `npx browserslist` in your project directory to see project’s
   target browsers. This CLI tool is built-in and available in any project
   with Autoprefixer.
 
 [`browserslist-useragent-regexp`]: https://github.com/browserslist/browserslist-useragent-regexp
+[`browserslist-adobe-analytics`]:  https://github.com/xeroxinteractive/browserslist-adobe-analytics
 [`browserslist-useragent-ruby`]:   https://github.com/browserslist/browserslist-useragent-ruby
 [`browserslist-browserstack`]:     https://github.com/xeroxinteractive/browserslist-browserstack
 [`browserslist-ga-export`]:        https://github.com/browserslist/browserslist-ga-export

package/cli.js

@@ -3,19 +3,23 @@
 var fs = require('fs')
 
 var browserslist = require('./')
+var updateDb = require('./update-db')
 var pkg = require('./package.json')
+
 var args = process.argv.slice(2)
 
 var USAGE = 'Usage:\n' +
-            '  ' + pkg.name + '\n' +
-            '  ' + pkg.name + ' "QUERIES"\n' +
-            '  ' + pkg.name + ' --json "QUERIES"\n' +
-            '  ' + pkg.name + ' --config="path/to/browserlist/file"\n' +
-            '  ' + pkg.name + ' --coverage "QUERIES"\n' +
-            '  ' + pkg.name + ' --coverage=US "QUERIES"\n' +
-            '  ' + pkg.name + ' --coverage=US,RU,global "QUERIES"\n' +
-            '  ' + pkg.name + ' --env="environment name defined in config"\n' +
-            '  ' + pkg.name + ' --stats="path/to/browserlist/stats/file"'
+            '  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) {
   return args.some(function (str) {
@@ -24,14 +28,18 @@ function isArg (arg) {
 }
 
 function error (msg) {
-  process.stderr.write(pkg.name + ': ' + msg + '\n')
+  process.stderr.write('browserslist: ' + msg + '\n')
   process.exit(1)
 }
 
 if (isArg('--help') || isArg('-h')) {
   process.stdout.write(pkg.description + '.\n\n' + USAGE + '\n')
 } else if (isArg('--version') || isArg('-v')) {
-  process.stdout.write(pkg.name + ' ' + pkg.version + '\n')
+  process.stdout.write('browserslist ' + pkg.version + '\n')
+} else if (isArg('--update-db')) {
+  updateDb(function (str) {
+    process.stdout.write(str)
+  })
 } else {
   var mode = 'browsers'
   var opts = { }
@@ -65,6 +73,8 @@ if (isArg('--help') || isArg('-h')) {
       }
     } else if (name === '--json') {
       mode = 'json'
+    } else if (name === '--mobile-to-desktop') {
+      opts.mobileToDesktop = true
     } else {
       error('Unknown arguments ' + args[i] + '.\n\n' + USAGE)
     }

package/index.js

@@ -148,6 +148,43 @@ function compareSemver (a, b) {
   )
 }
 
+// this follows the npm-like semver behavior
+function semverFilterLoose (operator, range) {
+  range = range.split('.').map(parseSimpleInt)
+  if (typeof range[1] === 'undefined') {
+    range[1] = 'x'
+  }
+  // ignore any patch version because we only return minor versions
+  // range[2] = 'x'
+  switch (operator) {
+    case '<=':
+      return function (version) {
+        version = version.split('.').map(parseSimpleInt)
+        return compareSemverLoose(version, range) <= 0
+      }
+    default:
+    case '>=':
+      return function (version) {
+        version = version.split('.').map(parseSimpleInt)
+        return compareSemverLoose(version, range) >= 0
+      }
+  }
+}
+
+// this follows the npm-like semver behavior
+function compareSemverLoose (version, range) {
+  if (version[0] !== range[0]) {
+    return version[0] < range[0] ? -1 : +1
+  }
+  if (range[1] === 'x') {
+    return 0
+  }
+  if (version[1] !== range[1]) {
+    return version[1] < range[1] ? -1 : +1
+  }
+  return 0
+}
+
 function resolveVersion (data, version) {
   if (data.versions.indexOf(version) !== -1) {
     return version
@@ -551,7 +588,7 @@ browserslist.coverage = function (browsers, stats) {
     } else {
       stats = stats.toUpperCase()
     }
-    env.loadCountry(browserslist.usage, stats)
+    env.loadCountry(browserslist.usage, stats, browserslist.data)
     data = browserslist.usage[stats]
   } else {
     if ('dataByBrowser' in stats) {
@@ -786,7 +823,7 @@ var QUERIES = [
       } else {
         place = place.toLowerCase()
       }
-      env.loadCountry(browserslist.usage, place)
+      env.loadCountry(browserslist.usage, place, browserslist.data)
       var usage = browserslist.usage[place]
       return Object.keys(usage).reduce(function (result, version) {
         if (sign === '>') {
@@ -829,7 +866,7 @@ var QUERIES = [
           } else {
             place = place.toLowerCase()
           }
-          env.loadCountry(browserslist.usage, place)
+          env.loadCountry(browserslist.usage, place, browserslist.data)
           usage = browserslist.usage[place]
         }
       }
@@ -870,6 +907,31 @@ var QUERIES = [
       })
     }
   },
+  {
+    regexp: /^node\s+([\d.]+)\s*-\s*([\d.]+)$/i,
+    select: function (context, from, to) {
+      var nodeVersions = jsReleases.filter(function (i) {
+        return i.name === 'nodejs'
+      }).map(function (i) {
+        return i.version
+      })
+      var semverRegExp = /^(0|[1-9]\d*)(\.(0|[1-9]\d*)){0,2}$/
+      if (!semverRegExp.test(from)) {
+        throw new BrowserslistError(
+          'Unknown version ' + from + ' of Node.js')
+      }
+      if (!semverRegExp.test(to)) {
+        throw new BrowserslistError(
+          'Unknown version ' + to + ' of Node.js')
+      }
+      return nodeVersions
+        .filter(semverFilterLoose('>=', from))
+        .filter(semverFilterLoose('<=', to))
+        .map(function (v) {
+          return 'node ' + v
+        })
+    }
+  },
   {
     regexp: /^(\w+)\s+([\d.]+)\s*-\s*([\d.]+)$/i,
     select: function (context, name, from, to) {

package/node.js

@@ -137,6 +137,20 @@ function normalizeStats (data, stats) {
   return normalized
 }
 
+function normalizeUsageData (usageData, data) {
+  for (var browser in usageData) {
+    var browserUsage = usageData[browser]
+    // eslint-disable-next-line max-len
+    // https://github.com/browserslist/browserslist/issues/431#issuecomment-565230615
+    // caniuse-db returns { 0: "percentage" } for `and_*` regional stats
+    if ('0' in browserUsage) {
+      var versions = data[browser].versions
+      browserUsage[versions[versions.length - 1]] = browserUsage[0]
+      delete browserUsage[0]
+    }
+  }
+}
+
 module.exports = {
   loadQueries: function loadQueries (context, name) {
     if (!context.dangerousExtend) checkExtend(name)
@@ -201,16 +215,17 @@ module.exports = {
     }
   },
 
-  loadCountry: function loadCountry (usage, country) {
+  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 data = region(compressed)
+      var usageData = region(compressed)
+      normalizeUsageData(usageData, data)
       usage[country] = { }
-      for (var i in data) {
-        for (var j in data[i]) {
-          usage[country][i + ' ' + j] = data[i][j]
+      for (var i in usageData) {
+        for (var j in usageData[i]) {
+          usage[country][i + ' ' + j] = usageData[i][j]
         }
       }
     }
@@ -327,14 +342,7 @@ module.exports = {
     var halfYearAgo = Date.now() - TIME_TO_UPDATE_CANIUSE
 
     if (latest !== 0 && latest < halfYearAgo) {
-      var command = 'npm update'
-      eachParent(__filename, function (dir) {
-        var pckg = path.join(dir, 'package.json')
-        var yarnLock = path.join(dir, 'yarn.lock')
-        if (isFile(pckg) && isFile(yarnLock)) {
-          command = 'yarn upgrade'
-        }
-      })
+      var command = 'npx browserslist --update-db'
       console.warn(
         'Browserslist: caniuse-lite is outdated. ' +
         'Please run the following command: `' + command + '`'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "4.8.7",
+  "version": "4.11.0",
   "description": "Share target browsers between different front-end tools, like Autoprefixer, Stylelint and babel-env-preset",
   "keywords": [
     "caniuse",
@@ -15,9 +15,10 @@
   "license": "MIT",
   "repository": "browserslist/browserslist",
   "dependencies": {
-    "caniuse-lite": "^1.0.30001027",
-    "electron-to-chromium": "^1.3.349",
-    "node-releases": "^1.1.49"
+    "caniuse-lite": "^1.0.30001035",
+    "electron-to-chromium": "^1.3.380",
+    "node-releases": "^1.1.52",
+    "pkg-up": "^3.1.0"
   },
   "bin": "./cli.js",
   "browser": {
@@ -26,9 +27,5 @@
   },
   "eslintIgnore": [
     "test/fixtures"
-  ],
-  "sharec": {
-    "config": "@logux/sharec-config",
-    "version": "0.5.7"
-  }
+  ]
 }

package/update-db.js

@@ -0,0 +1,131 @@
+var childProcess = require('child_process')
+var pkgUp = require('pkg-up')
+var path = require('path')
+var fs = require('fs')
+
+var BrowserslistError = require('./error')
+
+function detectLockfile () {
+  var packagePath = pkgUp.sync()
+  if (!packagePath) {
+    throw new BrowserslistError(
+      'Cannot find package.json. ' +
+      'Is it a right project to run npx browserslist --update-db?'
+    )
+  }
+
+  var rootDir = path.dirname(packagePath)
+  var lockfileNpm = path.join(rootDir, 'package-lock.json')
+  var lockfileYarn = path.join(rootDir, 'yarn.lock')
+  var lockfilePnpm = path.join(rootDir, 'pnpm-lock.yaml')
+
+  if (fs.existsSync(lockfileNpm)) {
+    return { mode: 'npm', file: lockfileNpm }
+  } else if (fs.existsSync(lockfileYarn)) {
+    return { mode: 'yarn', file: lockfileYarn }
+  } else if (fs.existsSync(lockfilePnpm)) {
+    return { mode: 'pnpm', file: lockfilePnpm }
+  } else {
+    throw new BrowserslistError(
+      'No lockfile found. Run "npm install", "yarn install" or "pnpm install"'
+    )
+  }
+}
+
+function getCurrentVersion (lock) {
+  var match
+  if (lock.mode === 'npm') {
+    var dependencies = JSON.parse(lock.content).dependencies
+    if (dependencies && dependencies['caniuse-lite']) {
+      return dependencies['caniuse-lite'].version
+    }
+  } else if (lock.mode === 'yarn') {
+    match = /caniuse-lite@[^:]+:\n\s+version\s+"([^"]+)"/.exec(lock.content)
+    if (match[1]) return match[1]
+  } else if (lock.mode === 'pnpm') {
+    match = /\/caniuse-lite\/([^:]+):/.exec(lock.content)
+    if (match[1]) return match[1]
+  }
+  return null
+}
+
+function getLastestInfo () {
+  return JSON.parse(
+    childProcess.execSync('npm show caniuse-lite --json').toString()
+  )
+}
+
+function updateLockfile (lock, latest) {
+  if (lock.mode === 'npm') {
+    var fixed = deletePackage(JSON.parse(lock.content))
+    return JSON.stringify(fixed, null, '  ')
+  } else {
+    var lines = lock.content.split('\n')
+    var i
+    if (lock.mode === 'yarn') {
+      for (i = 0; i < lines.length; i++) {
+        if (lines[i].indexOf('caniuse-lite@') !== -1) {
+          lines[i + 1] = lines[i + 1].replace(
+            /version "[^"]+"/, 'version "' + latest.version + '"'
+          )
+          lines[i + 2] = lines[i + 2].replace(
+            /resolved "[^"]+"/, 'resolved "' + latest.dist.tarball + '"'
+          )
+          lines[i + 3] = lines[i + 3].replace(
+            /integrity .+/, 'integrity ' + latest.dist.integrity
+          )
+          i += 4
+        }
+      }
+    } else if (lock.mode === 'pnpm') {
+      for (i = 0; i < lines.length; i++) {
+        if (lines[i].indexOf('caniuse-lite:') >= 0) {
+          lines[i] = lines[i].replace(/: .*$/, ': ' + latest.version)
+        } else if (lines[i].indexOf('/caniuse-lite') >= 0) {
+          lines[i] = lines[i].replace(/\/[^/:]+:/, '/' + latest.version + ':')
+          for (i = i + 1; i < lines.length; i++) {
+            if (lines[i].indexOf('integrity: ') !== -1) {
+              lines[i] = lines[i].replace(
+                /integrity: .+/, 'integrity: ' + latest.dist.integrity
+              )
+            } else if (lines[i].indexOf(' /') !== -1) {
+              break
+            }
+          }
+        }
+      }
+    }
+    return lines.join('\n')
+  }
+}
+
+function deletePackage (node) {
+  if (node.dependencies) {
+    delete node.dependencies['caniuse-lite']
+    for (var i in node.dependencies) {
+      node.dependencies[i] = deletePackage(node.dependencies[i])
+    }
+  }
+  return node
+}
+
+module.exports = function updateDB (print) {
+  var lock = detectLockfile()
+  lock.content = fs.readFileSync(lock.file).toString()
+
+  var current = getCurrentVersion(lock)
+  var latest = getLastestInfo()
+
+  if (typeof current === 'string') {
+    print('Current version: ' + current + '\n')
+  }
+  print(
+    'New version: ' + latest.version + '\n' +
+    'Updating caniuse-lite…\n'
+  )
+
+  fs.writeFileSync(lock.file, updateLockfile(lock, latest))
+  childProcess.execSync(lock.mode + ' install')
+
+  print('caniuse-lite has been successfully updated')
+}