Refactoring, env, closing a bunch of issues (#53)

* Remove presets and plugin mapping. Babel does this just fine.

* Less brackets

* Have no idea what is this for

* Add explanation comment

* Require instead of plain reading and parsing

* Add ESLint and eslint-config-brunch

* Fix linting errors in index.js

* Lint all files

* Fix linting errors in test.js

* Fix for old NPMs

* Add config lookup function

* Fix README.md

* Use OptionManager

* Add babelConfig checking

* indexOf -> includes

* Adjust tests

* Node.js <6 doesn't support Array#includes

* babel-preset-latest -> babel-preset-env

* assert -> chai.should, because of @shvaikalesh

* should.be.a() -> respondTo

* Remove extras from tests

* Detect UglifyJS and set corresponding target

* Don't return Assertion to Mocha

* Better: useUglify -> targetUglify

* Update and clean-up README.md

* Remove useless checking

* Explicitly return false if it's not production, but UglifyJS present

* Update Travis configuration

Author: denysdovhan

.eslintrc.json

@@ -1,6 +1,5 @@
-sudo: false
 language: node_js
 node_js:
-  - '6'
-  - '5'
-  - '4'
+  - node
+  - 6
+  - 4

.travis.yml

@@ -1,22 +1,42 @@
 ## babel-brunch
 
-Brunch plugin using [babel](https://github.com/babel/babel) to turn latest
+Brunch plugin using [Babel](https://github.com/babel/babel) to turn latest
 ECMAScript standard code into vanilla ES5 with no runtime required.
 
 All the `.js` files in your project will be run through the babel compiler,
 except those it is configured to ignore, unless you use the `pattern` option.
 
-Additionally, starting Brunch 2.7, babel-brunch will also compile NPM dependencies.
+Additionally, starting Brunch 2.7, `babel-brunch` will also compile NPM dependencies.
 
 ## Installation
 
-`npm install --save-dev babel-brunch`
+```
+npm install --save-dev babel-brunch
+```
 
 ## Configuration
 
-[babel-preset-latest](https://babeljs.io/docs/plugins/preset-latest/) (es2015, es2016, es2017) **is used by default**, you don't need to adjust config to have it.
+[babel-preset-env](https://github.com/babel/babel-preset-env) (a Babel preset that can automatically determine the plugins and polyfills you need based on your supported environments) **is used by default**.
+
+The default behavior without options runs all transforms (behaves the same as [babel-preset-latest](https://babeljs.io/docs/plugins/preset-latest/)).
+
+Optionally, you can configure the preset for your needs:
+
+```js
+module.exports.plugins = {
+  babel: {
+    presets: [['env', {
+      targets: {
+        browsers: ['last 2 versions', 'safari >= 7']
+      }
+    }]]
+  }
+}
+```
+
+Read more about [`env`'s options](https://github.com/babel/babel-preset-env#options).
 
-### Using React; or any other plugin
+### Using React or any other plugin
 
 Install a plugin:
 
@@ -26,23 +46,20 @@ npm install --save-dev babel-preset-react
 
 Then, make sure Brunch sees it:
 
-```javascript
-exports.plugins = {
+```js
+module.exports.plugins = {
+  // ...
   babel: {
-    presets: ['latest', 'react']
+    presets: ['env', 'react']
   }
 }
 ```
 
-Optionally, you can configure the preset:
-
-`presets: [ 'latest', ['transform-es2015-template-literals', {spec: true}] ]`
-
-
 ### Ignoring node modules
 
-```
-exports.plugins = {
+```js
+module.exports.plugins = {
+  // ...
   babel: {
     ignore: [
       /^node_modules/,
@@ -52,21 +69,23 @@ exports.plugins = {
 }
 ```
 
-### Changing which files would be compiled by babel
+### Changing which files would be compiled by Babel
 
-```
-exports.plugins = {
+```js
+module.exports.plugins = {
+  // ...
   babel: {
     pattern: /\.es7$/ // By default, JS|JSX|ES6 are used.
   }
 }
 ```
 
-Set [babel options](https://babeljs.io/docs/usage/options) in your brunch
+Set [Babel options](https://babeljs.io/docs/usage/options) in your Brunch
 config (such as `brunch-config.js`) except for `filename` and `sourceMap`
 which are handled internally.
 
 ## Change Log
+
 [See release notes page on GitHub](https://github.com/babel/babel-brunch/releases)
 
 ## License

README.md

@@ -2,24 +2,36 @@
 
 const babel = require('babel-core');
 const anymatch = require('anymatch');
-const resolve = require('path').resolve;
 const logger = require('loggy');
 
 const reIg = /^(bower_components|vendor)/;
 
 const warns = {
-  ES6to5: 'Please use `babel` instead of `ES6to5` option in your config file.'
+  ES6to5: 'Please use `babel` instead of `ES6to5` option in your config file.',
 };
 
-const prettySyntaxError = (err) => {
+const prettySyntaxError = err => {
   if (!(err._babel && err instanceof SyntaxError)) return err;
-  const msg = err.message.replace(/\(\d+:\d+\)$/, '').replace(/^([\./\w]+\:\s)/, '');
+  const msg = err.message
+    .replace(/\(\d+:\d+\)$/, '')
+    .replace(/^([./\w]+:\s)/, '');
   const error = new Error(`L${err.loc.line}:${err.loc.column} ${msg}\n${err.codeFrame}`);
   error.name = '';
   error.stack = err.stack;
   return error;
 };
 
+const targetUglify = () => {
+  try {
+    const isProduction = process.env.NODE_ENV === 'production';
+    const isUglify = require('uglify-js-brunch');
+    if (isProduction && isUglify) return true;
+    return false;
+  } catch (e) {
+    return false;
+  }
+};
+
 class BabelCompiler {
   constructor(config) {
     if (!config) config = {};
@@ -38,33 +50,12 @@ class BabelCompiler {
     }, {});
 
     opts.sourceMap = !!config.sourceMaps;
-    if (!opts.presets) {
-      opts.presets = ['latest'];
-      // ['env', opts.env]
-    }
-    if (!opts.plugins) opts.plugins = [];
-
-    // this is needed so that babel can locate presets when compiling node_modules
-    const mapOption = type => data => {
-      const resolvePath = name => {
-        // for cases when plugins name do not match common convention
-        // for example: `babel-root-import`
-        const plugin = name.startsWith('babel-') ? name : `babel-${type}-${name}`;
-        return resolve(config.paths.root, 'node_modules', plugin);
-      };
-      if (typeof data === 'string') return resolvePath(data);
-      return [resolvePath(data[0]), data[1]];
-    };
-    const mappedPresets = opts.presets.map(mapOption('preset'));
-    const mappedPlugins = opts.plugins.map(mapOption('plugin'));
-    opts.presets = mappedPresets;
-    opts.plugins = mappedPlugins;
-    if (opts.presets.length === 0) delete opts.presets;
-    if (opts.plugins.length === 0) delete opts.plugins;
+
     if (opts.pattern) {
       this.pattern = opts.pattern;
       delete opts.pattern;
     }
+
     this.isIgnored = anymatch(options.ignore || reIg);
     this.options = opts;
   }
@@ -74,6 +65,19 @@ class BabelCompiler {
     this.options.filename = file.path;
     this.options.sourceFileName = file.path;
 
+    if (!this.options.presets) {
+      const babelConfig = new babel.OptionManager().init(this.options);
+      const hasConfig =
+        babelConfig.presets && babelConfig.presets.length ||
+        babelConfig.plugins && babelConfig.plugins.length;
+
+      if (!hasConfig) {
+        this.options.presets = [['env', {
+          targets: targetUglify() ? {uglify: true} : {},
+        }]];
+      }
+    }
+
     return new Promise((resolve, reject) => {
       let compiled;
 

index.js

@@ -22,21 +22,26 @@
     "6to5"
   ],
   "scripts": {
-    "test": "eslint index.js && mocha"
+    "test": "eslint *.js && mocha"
   },
   "files": [
     "index.js"
   ],
   "dependencies": {
     "anymatch": "^1.0.0",
-    "babel-core": "^6.0.0",
-    "babel-preset-latest": "^6.22.0",
+    "babel-core": "^6.24.0",
+    "babel-preset-env": "^1.2.2",
     "loggy": "~1.0.1"
   },
   "devDependencies": {
     "babel-plugin-transform-es2015-template-literals": "^6.8.0",
     "babel-plugin-transform-node-env-inline": "^6.1.18",
-    "mocha": "^2.0.0",
-    "eslint": "^2.0.0"
+    "chai": "^3.5.0",
+    "eslint": "^3.17.1",
+    "eslint-config-brunch": "^1.0.0",
+    "mocha": "^2.0.0"
+  },
+  "eslintConfig": {
+    "extends": "brunch"
   }
 }