Merge pull request #41 from weaverryan/fix-babel-loader-7.1

Forcing babel-loader 7.1 and updating resolve-rc for new argument

Author: weaverryan

lib/WebpackConfig.js

@@ -176,7 +176,7 @@ class WebpackConfig {
         }
 
         if (this.doesBabelRcFileExist()) {
-            throw new Error('configureBabel() cannot be called because your app has a .babelrc file. Either put all of your Babel configuration in that file, or delete it and use this function.');
+            throw new Error('configureBabel() cannot be called because your app already has Babel configuration (a `.babelrc` file, `.babelrc.js` file or `babel` key in `package.json`). Either put all of your Babel configuration in that file, or delete it and use this function.');
         }
 
         this.babelConfigurationCallback = callback;

lib/config/parse-runtime.js

@@ -63,7 +63,7 @@ module.exports = function(argv, cwd) {
         runtimeConfig.helpRequested = true;
     }
 
-    runtimeConfig.babelRcFileExists = (typeof resolveRc(runtimeConfig.context)) !== 'undefined';
+    runtimeConfig.babelRcFileExists = (typeof resolveRc(require('fs'), runtimeConfig.context)) !== 'undefined';
 
     return runtimeConfig;
 };

package.json

@@ -27,7 +27,7 @@
   "homepage": "https://github.com/symfony/webpack-encore",
   "dependencies": {
     "babel-core": "^6.24.0",
-    "babel-loader": "^7.0.0",
+    "babel-loader": "^7.1.0",
     "babel-preset-env": "^1.2.2",
     "chalk": "^1.1.3",
     "clean-webpack-plugin": "^0.1.16",

test/WebpackConfig.js

@@ -248,7 +248,7 @@ describe('WebpackConfig object', () => {
 
             expect(() => {
                 config.configureBabel(() => {});
-            }).to.throw('configureBabel() cannot be called because your app has a .babelrc file');
+            }).to.throw('configureBabel() cannot be called because your app already has Babel configuration');
         });
     });
 

test/config/parse-runtime.js

@@ -23,7 +23,7 @@ function createTestDirectory() {
     const projectDir = testSetup.createTestAppDir();
     fs.writeFileSync(
         path.join(projectDir, 'package.json'),
-        ''
+        '{}'
     );
 
     return projectDir;