Merge branch 'fix-options' into 7.0

# Conflicts: # test/loader.test.js
babel · Mar 16, 2017 · fb8c271 · fb8c271
2 parents 1ed7ff5 + 05a31c5
commit fb8c271
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-loader",
-  "version": "7.0.0-alpha.2",
+  "version": "7.0.0-alpha.3",
   "description": "babel module loader for webpack",
   "files": [
     "lib"

diff --git a/test/loader.test.js b/test/loader.test.js
@@ -254,7 +254,9 @@ test.cb("should not throw without config", (t) => {
 
   webpack(config, (err, stats) => {
     t.is(err, null);
+
     t.true(stats.compilation.errors.length === 0);
+
     t.end();
   });
 });