Merge remote-tracking branch 'werk85/master' into develop

* werk85/master:
  README updated
  Upgraded to Babel 6
  5.3.3
  pin babel-core version in peerDependencies as it'll try and install babel 6...
  Clarify note on deprecated peerDependencies

Author: Luis Couto

README.md

@@ -11,7 +11,7 @@
 npm install babel-loader --save-dev
 ```
 
-__Note:__ [npm](https://npmjs.com) will deprecate [peerDependencies](https://github.com/npm/npm/issues/6565) on the next major release, so required dependencies like babel-core and webpack will have to be installed manually.
+__Note:__ [npm](https://npmjs.com) will deprecate [auto-installing of peerDependencies](https://github.com/npm/npm/issues/6565) on the next major release, so required peer dependencies like babel-core and webpack will have to be listed explicitly in your `package.json`.
 
 ## Usage
 
@@ -43,7 +43,7 @@ module: {
     {
       test: /\.jsx?$/,
       exclude: /(node_modules|bower_components)/,
-      loader: 'babel?optional[]=runtime&stage=0'
+      loader: 'babel?presets[]=es2015'
     }
   ]
 }
@@ -59,8 +59,7 @@ module: {
       exclude: /(node_modules|bower_components)/,
       loader: 'babel',
       query: {
-        optional: ['runtime'],
-        stage: 0
+        presets: ['es2015']
       }
     }
   ]
@@ -107,7 +106,7 @@ loaders: [
   {
     test: /\.jsx?$/,
     exclude: /(node_modules|bower_components)/,
-    loader: 'babel?optional[]=runtime'
+    loader: 'babel?presets[]=es2015'
   }
 ]
 ```

index.js

@@ -68,5 +68,4 @@ module.exports = function(source, inputSourceMap) {
 
   result = transpile(source, options);
   this.callback(null, result.code, result.map);
-
 };

package.json

@@ -1,19 +1,20 @@
 {
   "name": "babel-loader",
-  "version": "5.3.2",
+  "version": "6.0.0",
   "description": "babel module loader for webpack",
   "main": "index.js",
   "dependencies": {
-    "babel-core": "^5.4.0",
+    "babel-core": "^6.0.12",
     "loader-utils": "^0.2.9",
     "object-assign": "^3.0.0"
   },
   "peerDependencies": {
-    "babel-core": "*",
+    "babel-core": "^6.0.12",
     "webpack": "*"
   },
   "devDependencies": {
-    "babel-core": "^5.5.8",
+    "babel-core": "^6.0.12",
+    "babel-preset-es2015": "^6.0.12",
     "expect.js": "^0.3.1",
     "istanbul": "^0.3.15",
     "jscs": "^1.13.1",

test/cache.test.js

@@ -42,12 +42,13 @@ describe('Filesystem Cache', function() {
 
   it('should output files to cache directory', function(done) {
 
+    var loader = babelLoader + '?presets[]=es2015&cacheDirectory=' + cacheDir;
     var config = assign({}, globalConfig, {
       module: {
         loaders: [
           {
             test: /\.jsx?/,
-            loader: babelLoader + '?cacheDirectory=' + cacheDir,
+            loader: loader,
             exclude: /node_modules/,
           },
         ],
@@ -71,7 +72,7 @@ describe('Filesystem Cache', function() {
         loaders: [
           {
             test: /\.jsx?/,
-            loader: babelLoader + '?cacheDirectory',
+            loader: babelLoader + '?presets[]=es2015cacheDirectory',
             exclude: /node_modules/,
           },
         ],
@@ -95,12 +96,13 @@ describe('Filesystem Cache', function() {
   });
 
   it('should read from cache directory if cached file exists', function(done) {
+    var loader = babelLoader + '?presets[]=es2015&cacheDirectory=' + cacheDir;
     var config = assign({}, globalConfig, {
       module: {
         loaders: [
           {
             test: /\.jsx?/,
-            loader: babelLoader + '?cacheDirectory=' + cacheDir,
+            loader: loader,
             exclude: /node_modules/,
           },
         ],
@@ -125,12 +127,13 @@ describe('Filesystem Cache', function() {
   });
 
   it('should have one file per module', function(done) {
+    var loader = babelLoader + '?presets[]=es2015&cacheDirectory=' + cacheDir;
     var config = assign({}, globalConfig, {
       module: {
         loaders: [
           {
             test: /\.jsx?/,
-            loader: babelLoader + '?cacheDirectory=' + cacheDir,
+            loader: loader,
             exclude: /node_modules/,
           },
         ],
@@ -163,6 +166,7 @@ describe('Filesystem Cache', function() {
               query: {
                 cacheDirectory: cacheDir,
                 cacheIdentifier: 'a',
+                presets: ['es2015'],
               },
             },
           ],
@@ -178,6 +182,7 @@ describe('Filesystem Cache', function() {
               query: {
                 cacheDirectory: cacheDir,
                 cacheIdentifier: 'b',
+                presets: ['es2015'],
               },
             },
           ],

test/fixtures/experimental.js

@@ -45,7 +45,7 @@ describe('Loader', function() {
         loaders: [
           {
             test: /\.jsx?/,
-            loader: babelLoader,
+            loader: babelLoader + '?presets[]=es2015',
             exclude: /node_modules/,
           },
         ],
@@ -78,15 +78,15 @@ describe('Loader', function() {
         loaders: [
           {
             test: /\.jsx?/,
-            loader: babelLoader,
+            loader: babelLoader + '?presets[]=es2015',
             exclude: /node_modules/,
           },
         ],
       },
     });
 
     webpack(config, function(err, stats) {
-      expect(stats.compilation.errors).to.have.length();
+      expect(stats.compilation.errors.length).to.be(1);
       expect(stats.compilation.errors[0]).to.be.an(Error);
 
       return done();

test/loader.test.js

@@ -40,12 +40,12 @@ describe('Options', function() {
 
   it('should interpret options given to the loader', function(done) {
     var config = assign({}, globalConfig, {
-      entry: './test/fixtures/experimental.js',
+      entry: './test/fixtures/basic.js',
       module: {
         loaders: [
           {
             test: /\.jsx?/,
-            loader: babelLoader + '?stage=0',
+            loader: babelLoader + '?presets[]=es2015',
             exclude: /node_modules/,
           },
         ],
@@ -67,9 +67,9 @@ describe('Options', function() {
   it('should interpret options given globally', function(done) {
 
     var config = assign({}, globalConfig, {
-      entry: './test/fixtures/experimental.js',
+      entry: './test/fixtures/basic.js',
       babel: {
-        stage: 0,
+        presets: ['es2015'],
       },
       module: {
         loaders: [
@@ -96,15 +96,15 @@ describe('Options', function() {
 
   it('should give priority to loader options', function(done) {
     var config = assign({}, globalConfig, {
-      entry: './test/fixtures/experimental.js',
+      entry: './test/fixtures/basic.js',
       babel: {
-        stage: 4,
+        presets: [],
       },
       module: {
         loaders: [
           {
             test: /\.jsx?/,
-            loader: babelLoader + '?stage=0',
+            loader: babelLoader + '?presets[]=es2015',
             exclude: /node_modules/,
           },
         ],

test/options.test.js

@@ -47,7 +47,7 @@ describe('Sourcemaps', function() {
         loaders: [
           {
             test: /\.jsx?/,
-            loader: babelLoader,
+            loader: babelLoader + '?presets[]=es2015',
             exclude: /node_modules/,
           },
         ],