Merge branch 'release/v6.2.1'

* release/v6.2.1:
  Bump patch version
  Fix conflicts
  cache: make sure the directory exists, asynchronously

index.js

@@ -83,8 +83,8 @@ module.exports = function(source, inputSourceMap) {
       if (err) { return callback(err); }
       return callback(null, result.code, result.map);
     });
-  } else {
-    result = transpile(source, options);
-    this.callback(null, result.code, result.map);
   }
+
+  result = transpile(source, options);
+  this.callback(null, result.code, result.map);
 };

lib/fs-cache.js

@@ -10,6 +10,7 @@
  * @see https://github.com/babel/babel-loader/pull/41
  */
 var crypto = require('crypto');
+var mkdirp = require('mkdirp');
 var fs = require('fs');
 var os = require('os');
 var path = require('path');
@@ -128,23 +129,27 @@ var cache = module.exports = function(params, callback) {
         os.tmpdir();
   var file = path.join(directory, filename(source, identifier, options));
 
-  return read(file, function(err, content) {
-    var result = {};
-    // No errors mean that the file was previously cached
-    // we just need to return it
-    if (!err) { return callback(null, content); }
-
-    // Otherwise just transform the file
-    // return it to the user asap and write it in cache
-    try {
-      result = transform(source, options);
-    } catch (error) {
-      return callback(error);
-    }
-
-    return write(file, result, function(err) {
-      return callback(err, result);
-    });
+  // Make sure the directory exists.
+  return mkdirp(directory, function(err) {
+    if (err) { return callback(err); }
+
+    return read(file, function(err, content) {
+      var result = {};
+      // No errors mean that the file was previously cached
+      // we just need to return it
+      if (!err) { return callback(null, content); }
 
+      // Otherwise just transform the file
+      // return it to the user asap and write it in cache
+      try {
+        result = transform(source, options);
+      } catch (error) {
+        return callback(error);
+      }
+
+      return write(file, result, function(err) {
+        return callback(err, result);
+      });
+    });
   });
 };

lib/helpers/exists.js

@@ -10,7 +10,6 @@ var fs = require('fs');
  * exists('.babelrc'); // false
  */
 module.exports = function(cache) {
-
   cache = cache || {};
 
   return function(filename) {

lib/helpers/read.js

@@ -10,7 +10,6 @@ var fs = require('fs');
  * read('.babelrc'); // file contents...
  */
 module.exports = function(cache) {
-
   cache = cache || {};
 
   return function(filename) {

package.json

@@ -1,13 +1,14 @@
 {
   "name": "babel-loader",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "description": "babel module loader for webpack",
   "files": [
     "index.js",
     "lib"
   ],
   "dependencies": {
     "loader-utils": "^0.2.11",
+    "mkdirp": "^0.5.1",
     "object-assign": "^4.0.1"
   },
   "peerDependencies": {