browserslist 2.1.0 → 2.1.4

package/CHANGELOG.md

@@ -1,6 +1,18 @@
 # Change Log
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.1.4
+* Use both ESR versions when they actual.
+
+## 2.1.3
+* Add warning on first exclude query.
+
+## 2.1.2
+* Fix non-Node.js environments support.
+
+## 2.1.1
+* Fix CLI arguments parsing.
+
 ## 2.1
 * Add `>= 5%`, `>= 5% in US` and `>= 5% in my stats` queries.
 

package/README.md

@@ -1,8 +1,17 @@
 # Browserslist
 
+<img align="right" width="100" height="100"
+     src="http://ai.github.io/browserslist/logo.svg"
+     title="Browserslist logo by Anton Lovchikov">
+
 Library to share supported browsers list between different front-end tools.
-It is used in [Autoprefixer], [babel-env-preset], [eslint-plugin-compat]
-and [stylelint-no-unsupported-browser-features].
+It is used in:
+
+* [Autoprefixer]
+* [babel-env-preset] (no config support, only tool option)
+* [eslint-plugin-compat]
+* [stylelint-no-unsupported-browser-features]
+* [postcss-normalize]
 
 All tools that rely on Browserslist will find its config automatically,
 when you add the following to `package.json`:
@@ -47,6 +56,7 @@ You can test Browserslist queries in [online demo].
 [stylelint-no-unsupported-browser-features]: https://github.com/ismay/stylelint-no-unsupported-browser-features
 [eslint-plugin-compat]:                      https://github.com/amilajack/eslint-plugin-compat
 [babel-env-preset]:                          https://github.com/babel/babel-preset-env
+[postcss-normalize]:                         https://github.com/jonathantneal/postcss-normalize
 [Autoprefixer]:                              https://github.com/postcss/autoprefixer
 [online demo]:                               http://browserl.ist/
 [Can I Use]:                                 http://caniuse.com/

package/cli.js

@@ -4,92 +4,94 @@ var browserslist = require('./');
 var pkg          = require('./package.json');
 var args         = process.argv.slice(2);
 
+var USAGE = 'Usage:\n' +
+            '  ' + pkg.name + ' "QUERIES"\n' +
+            '  ' + pkg.name + ' --coverage "QUERIES"\n' +
+            '  ' + pkg.name + ' --coverage=US "QUERIES"\n' +
+            '  ' + pkg.name + ' --config="path/to/browserlist/file"\n' +
+            '  ' + pkg.name + ' --env="environment name defined in config"\n' +
+            '  ' + pkg.name + ' --stats="path/to/browserlist/stats/file"';
+
 function isArg(arg) {
     return args.some(function (str) {
         return str === arg || str.indexOf(arg + '=') === 0;
     });
 }
 
-function getArgValue(arg) {
-    var found = args.filter(function (str) {
-        return str.indexOf(arg + '=') === 0;
-    })[0];
-    var value = found && found.split('=')[1];
-    return value && value.replace(/^['"]|['"]$/g, '');
-}
-
 function error(msg) {
     process.stderr.write(pkg.name + ': ' + msg + '\n');
     process.exit(1);
 }
 
-function query(queries, opts) {
-    try {
-        return browserslist(queries, opts);
-    } catch (e) {
-        if ( e.name === 'BrowserslistError' ) {
-            return error(e.message);
-        } else {
-            throw e;
-        }
-    }
-}
-
-if ( args.length === 0 || isArg('--help') || isArg('-h') ) {
-    process.stdout.write([
-        pkg.description,
-        '',
-        'Usage:',
-        '  ' + pkg.name + ' "QUERIES"',
-        '  ' + pkg.name + ' --coverage "QUERIES"',
-        '  ' + pkg.name + ' --coverage=US "QUERIES"',
-        '  ' + pkg.name + ' --config=browserslist "path/to/browserlist/file"',
-        '  ' + pkg.name + ' --env="environment name defined in config"',
-        '  ' + pkg.name + ' --stats="path/to/browserlist/stats/file"'
-    ].join('\n') + '\n');
+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');
 
-} else if ( isArg('--coverage') || isArg('-c') ) {
-    var browsers = args.find(function (i) {
-        return i[0] !== '-';
-    });
-    if ( !browsers ) error('Define a browsers query to get coverage');
+} else {
+    var mode = 'browsers';
+    var opts = { };
+    var queries;
+    var country;
+
+    for ( var i = 0; i < args.length; i++ ) {
+        if ( args[i][0] !== '-' ) {
+            queries = args[i].replace(/^['"]|['"]$/g, '');
+            continue;
+        }
 
-    var country = getArgValue('--coverage') || getArgValue('-c');
-    var result  = browserslist.coverage(query(browsers), country);
-    var round   = Math.round(result * 100) / 100.0;
+        var arg = args[i].split('=');
+        var name = arg[0];
+        var value = arg[1];
+
+        if ( value ) value = value.replace(/^['"]|['"]$/g, '');
+
+        if ( name === '--config' || name === '-b' ) {
+            opts.config = value;
+        } else if ( name === '--env' || name === '-e' ) {
+            opts.env = value;
+        } else if ( name === '--stats' || name === '-s' ) {
+            opts.stats = value;
+        } else if ( name === '--coverage' || name === '-c' ) {
+            mode = 'coverage';
+            if ( value ) country = value;
+        } else {
+            error('Unknown arguments ' + args[i] + '.\n\n' + USAGE);
+        }
+    }
 
-    var end = 'globally';
-    if (country && country !== 'global') {
-        end = 'in the ' + country.toUpperCase();
+    if ( !queries && !opts.config ) {
+        error('Define queries or browserslist config path.\n\n' + USAGE);
     }
 
-    process.stdout.write(
-        'These browsers account for ' + round + '% of all users ' + end + '\n');
+    var browsers;
+    try {
+        browsers = browserslist(queries, opts);
+    } catch (e) {
+        if ( e.name === 'BrowserslistError' ) {
+            error(e.message);
+        } else {
+            throw e;
+        }
+    }
 
-} else if ( args.length === 1 && args[0][0] !== '-' ) {
-    query(args[0]).forEach(function (browser) {
-        process.stdout.write(browser + '\n');
-    });
 
-} else if (isArg('--config') || isArg('-b')) {
-    var opts = {
-        config: getArgValue('--config') || getArgValue('-b')
-    };
+    if ( mode === 'browsers' ) {
+        browsers.forEach(function (browser) {
+            process.stdout.write(browser + '\n');
+        });
+    } else {
+        var result  = browserslist.coverage(browsers, country);
+        var round   = Math.round(result * 100) / 100.0;
 
-    if (isArg('--env') || isArg('-e')) {
-        opts.env = getArgValue('--env') || getArgValue('-e');
-    }
+        var end = 'globally';
+        if (country && country !== 'global') {
+            end = 'in the ' + country.toUpperCase();
+        }
 
-    if (isArg('--stats') || isArg('-s')) {
-        opts.stats = getArgValue('--stats') || getArgValue('-s');
+        process.stdout.write(
+            'These browsers account for ' + round + '% of all users ' +
+            end + '\n');
     }
-
-    query(null, opts).forEach(function (browser) {
-        process.stdout.write(browser + '\n');
-    });
-} else {
-    error('Unknown arguments. Use --help to pick right one.');
 }

package/index.js

@@ -51,6 +51,9 @@ var filenessCache = {};
 var configCache = {};
 
 function isFile(file) {
+    if ( !fs.existsSync ) {
+        return false;
+    }
     if ( file in filenessCache ) {
         return filenessCache[file];
     }
@@ -167,7 +170,11 @@ var browserslist = function (queries, opts) {
             queries = process.env.BROWSERSLIST;
         } else if ( opts.config || process.env.BROWSERSLIST_CONFIG ) {
             var file = opts.config || process.env.BROWSERSLIST_CONFIG;
-            queries = pickEnv(browserslist.readConfig(file), opts);
+            if ( path.basename(file) === 'package.json' ) {
+                queries = pickEnv(parsePackage(file), opts);
+            } else {
+                queries = pickEnv(browserslist.readConfig(file), opts);
+            }
         } else if ( opts.path ) {
             queries = pickEnv(browserslist.findConfig(opts.path), opts);
         }
@@ -204,11 +211,17 @@ var browserslist = function (queries, opts) {
 
     var result = [];
 
-    queries.forEach(function (selection) {
+    queries.forEach(function (selection, index) {
         if ( selection.trim() === '' ) return;
 
         var exclude = selection.indexOf('not ') === 0;
-        if ( exclude ) selection = selection.slice(4);
+        if ( exclude ) {
+            if ( index === 0 ) {
+                error('Write any browsers query (for instance, `defaults`) ' +
+                      'before `' + selection + '`');
+            }
+            selection = selection.slice(4);
+        }
 
         for ( var i in browserslist.queries ) {
             var type  = browserslist.queries[i];
@@ -609,7 +622,7 @@ browserslist.queries = {
     esr: {
         regexp: /^(firefox|ff|fx)\s+esr$/i,
         select: function () {
-            return ['firefox 52'];
+            return ['firefox 52', 'firefox 45'];
         }
     },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "browserslist",
-  "version": "2.1.0",
+  "version": "2.1.4",
   "description": "Share browsers list between different front-end tools, like Autoprefixer, Stylelint and babel-env-preset",
   "keywords": [
     "caniuse",
@@ -10,16 +10,16 @@
   "license": "MIT",
   "repository": "ai/browserslist",
   "dependencies": {
-    "caniuse-lite": "^1.0.30000659",
-    "electron-to-chromium": "^1.3.8"
+    "caniuse-lite": "^1.0.30000670",
+    "electron-to-chromium": "^1.3.11"
   },
   "bin": "./cli.js",
   "devDependencies": {
     "cross-spawn": "^5.1.0",
     "eslint": "^3.19.0",
     "eslint-config-postcss": "^2.0.2",
-    "jest": "^19.0.2",
-    "lint-staged": "^3.4.0",
+    "jest": "^20.0.3",
+    "lint-staged": "^3.4.2",
     "pre-commit": "^1.1.3",
     "yaspeller-ci": "^0.4.0"
   },
@@ -50,6 +50,9 @@
     "*.md": "yaspeller-ci",
     "*.js": "eslint"
   },
+  "browser": {
+    "fs": false
+  },
   "pre-commit": [
     "lint-staged"
   ]