babel-loader 6.2.9 → 6.2.10

package/lib/fs-cache.js

@@ -1,14 +1,5 @@
 "use strict";
 
-/**
- * Filesystem cache
- *
- * Given a file and a transform function, cache the result into files
- * or retrieve the previously cached files if the given file is already known.
- *
- * @see https://github.com/babel/babel-loader/issues/34
- * @see https://github.com/babel/babel-loader/pull/41
- */
 var crypto = require("crypto");
 var mkdirp = require("mkdirp");
 var findCacheDir = require("find-cache-dir");
@@ -17,13 +8,6 @@ var os = require("os");
 var path = require("path");
 var zlib = require("zlib");
 
-/**
- * Read the contents from the compressed file.
- *
- * @async
- * @params {String} filename
- * @params {Function} callback
- */
 var read = function read(filename, callback) {
   return fs.readFile(filename, function (err, data) {
     if (err) {
@@ -48,14 +32,6 @@ var read = function read(filename, callback) {
   });
 };
 
-/**
- * Write contents into a compressed file.
- *
- * @async
- * @params {String} filename
- * @params {String} result
- * @params {Function} callback
- */
 var write = function write(filename, result, callback) {
   var content = JSON.stringify(result);
 
@@ -68,14 +44,6 @@ var write = function write(filename, result, callback) {
   });
 };
 
-/**
- * Build the filename for the cached file
- *
- * @params {String} source  File source code
- * @params {Object} options Options used
- *
- * @return {String}
- */
 var filename = function filename(source, identifier, options) {
   var hash = crypto.createHash("SHA1");
   var contents = JSON.stringify({
@@ -89,72 +57,23 @@ var filename = function filename(source, identifier, options) {
   return hash.read().toString("hex") + ".json.gz";
 };
 
-/**
- * Retrieve file from cache, or create a new one for future reads
- *
- * @async
- * @param  {Object}   params
- * @param  {String}   params.directory  Directory to store cached files
- * @param  {String}   params.identifier Unique identifier to bust cache
- * @param  {String}   params.source   Original contents of the file to be cached
- * @param  {Object}   params.options  Options to be given to the transform fn
- * @param  {Function} params.transform  Function that will transform the
- *                                      original file and whose result will be
- *                                      cached
- *
- * @param  {Function<err, result>} callback
- *
- * @example
- *
- *   cache({
- *     directory: '.tmp/cache',
- *     identifier: 'babel-loader-cachefile',
- *     source: *source code from file*,
- *     options: {
- *       experimental: true,
- *       runtime: true
- *     },
- *     transform: function(source, options) {
- *       var content = *do what you need with the source*
- *       return content;
- *     }
- *   }, function(err, result) {
- *
- *   });
- */
-module.exports = function (params, callback) {
-  // Spread params into named variables
-  // Forgive user whenever possible
+var handleCache = function handleCache(directory, params, callback) {
   var source = params.source;
   var options = params.options || {};
   var transform = params.transform;
   var identifier = params.identifier;
-  var directory = void 0;
+  var shouldFallback = typeof params.directory !== "string" && directory !== os.tmpdir();
 
-  if (typeof params.directory === "string") {
-    directory = params.directory;
-  } else {
-    directory = findCacheDir({ name: "babel-loader" }) || os.tmpdir();
-  }
+  mkdirp(directory, function (err) {
+    if (err) return shouldFallback ? handleCache(os.tmpdir(), params, callback) : callback(err);
 
-  var file = path.join(directory, filename(source, identifier, options));
-
-  // Make sure the directory exists.
-  return mkdirp(directory, function (err) {
-    if (err) {
-      return callback(err);
-    }
+    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
+      if (!err) return callback(null, content);
+
       try {
         result = transform(source, options);
       } catch (error) {
@@ -162,8 +81,22 @@ module.exports = function (params, callback) {
       }
 
       return write(file, result, function (err) {
-        return callback(err, result);
+        if (err) return shouldFallback ? handleCache(os.tmpdir(), params, callback) : callback(err);
+
+        callback(null, result);
       });
     });
   });
+};
+
+module.exports = function (params, callback) {
+  var directory = void 0;
+
+  if (typeof params.directory === "string") {
+    directory = params.directory;
+  } else {
+    directory = findCacheDir({ name: "babel-loader" }) || os.tmpdir();
+  }
+
+  handleCache(directory, params, callback);
 };

package/lib/index.js

@@ -13,9 +13,6 @@ var read = require("./utils/read")();
 var resolveRc = require("./resolve-rc.js");
 var pkg = require("./../package.json");
 
-/**
- * Error thrown by Babel formatted to conform to Webpack reporting.
- */
 function BabelLoaderError(name, message, codeFrame, hideStack, error) {
   Error.call(this);
   Error.captureStackTrace(this, BabelLoaderError);
@@ -75,11 +72,9 @@ module.exports = function (source, inputSourceMap) {
 
   var result = {};
 
-  // Handle filenames (#106)
   var webpackRemainingChain = loaderUtils.getRemainingRequest(this).split("!");
   var filename = webpackRemainingChain[webpackRemainingChain.length - 1];
 
-  // Handle options
   var globalOptions = this.options.babel || {};
   var loaderOptions = loaderUtils.parseQuery(this.query);
   var userOptions = assign({}, globalOptions, loaderOptions);

package/lib/resolve-rc.js

@@ -1,13 +1,5 @@
 "use strict";
 
-/**
- * The purpose of this module, is to find the project's .babelrc and
- * use its contents to bust the babel-loader's internal cache whenever an option
- * changes.
- *
- * @see https://github.com/babel/babel-loader/issues/62
- * @see http://git.io/vLEvu
- */
 var path = require("path");
 var exists = require("./utils/exists")({});
 var read = require("./utils/read")({});
@@ -21,7 +13,6 @@ var find = function find(start, rel) {
 
   var up = path.dirname(start);
   if (up !== start) {
-    // Reached root
     return find(up, rel);
   }
 };

package/lib/utils/exists.js

@@ -1,14 +1,7 @@
 "use strict";
 
 var fs = require("fs");
-/**
- * Check if file exists and cache the result
- * return the result in cache
- *
- * @example
- * var exists = require('./helpers/fsExists')({});
- * exists('.babelrc'); // false
- */
+
 module.exports = function (cache) {
   cache = cache || {};
 

package/lib/utils/read.js

@@ -1,14 +1,7 @@
 "use strict";
 
 var fs = require("fs");
-/**
- * Read the file and cache the result
- * return the result in cache
- *
- * @example
- * var read = require('./helpers/fsExists')({});
- * read('.babelrc'); // file contents...
- */
+
 module.exports = function (cache) {
   cache = cache || {};
 

package/lib/utils/relative.js

@@ -6,7 +6,6 @@ module.exports = function relative(sourceRoot, filename) {
   var rootPath = sourceRoot.replace(/\\/g, "/").split("/")[1];
   var fileRootPath = filename.replace(/\\/g, "/").split("/")[1];
 
-  // If the file is in a completely different root folder use the absolute path of file.
   if (rootPath && rootPath !== fileRootPath) {
     return filename;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-loader",
-  "version": "6.2.9",
+  "version": "6.2.10",
   "description": "babel module loader for webpack",
   "files": [
     "lib"
@@ -14,7 +14,7 @@
   },
   "peerDependencies": {
     "babel-core": "^6.0.0",
-    "webpack": "1 || ^2.1.0-beta"
+    "webpack": "1 || 2 || ^2.1.0-beta || ^2.2.0-rc"
   },
   "devDependencies": {
     "ava": "^0.17.0",
@@ -33,14 +33,15 @@
     "eslint-plugin-flowtype": "^2.25.0",
     "nyc": "^10.0.0",
     "rimraf": "^2.4.3",
-    "webpack": "^2.1.0-beta.22"
+    "webpack": "^2.2.0-rc"
   },
   "scripts": {
+    "clean": "rimraf lib/",
     "build": "babel src/ --out-dir lib/",
     "coverage": "nyc report --reporter=json && codecov -f coverage/coverage-final.json",
     "lint": "eslint src test",
     "preversion": "npm test",
-    "prepublish": "npm run build",
+    "prepublish": "npm run clean && npm run build",
     "test": "npm run lint && cross-env BABEL_ENV=test npm run build && npm run test-only",
     "test-ci": "cross-env BABEL_ENV=test npm run build && npm run test-only",
     "test-only": "nyc ava"