babel-loader 7.0.0-alpha.3 → 7.1.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+For changes in version v7.0.0 and up please go to [release](https://github.com/babel/babel-loader/releases)
+
+# Old Changelog
+
+## v6.4.1
+
+### 🐛 Bug Fix
+
+- Fixed reset of BABEL_ENV when options.forceEnv is used (#420) @nikopavlica
+
 ## v6.4.0
 
 ### 🚀 New Feature
@@ -32,7 +42,7 @@ Allow to override BABEL_ENV/NODE_ENV at loader-level. Useful for isomorphic appl
 
 ### 💅 Polish
 
-- Improve FS caching to do less sync calls which improves performance slightly (#375) @akx 
+- Improve FS caching to do less sync calls which improves performance slightly (#375) @akx
 
 ## v6.2.10
 

package/README.md

@@ -19,6 +19,12 @@ __Notes:__ Issues with the output should be reported on the babel [issue tracker
 
 <h2 align="center">Install</h2>
 
+> webpack 1.x | babel-loader <= 6.x
+>
+> webpack 2.x | babel-loader >= 7.x (recommended) (^6.2.10 will also work, but with deprecation warnings)
+>
+> webpack 3.x | babel-loader >= 7.1
+
 ```bash
 yarn add babel-loader babel-core babel-preset-env webpack --dev
 ```
@@ -56,6 +62,7 @@ module: {
 
 See the `babel` [options](https://babeljs.io/docs/usage/api/#options).
 
+
 You can pass options to the loader by using the [options property](https://webpack.js.org/configuration/module/#rule-options-rule-query):
 
 ```javascript

package/lib/fs-cache.js

@@ -28,16 +28,12 @@ var defaultCacheDirectory = null; // Lazily instantiated when needed
  */
 var read = function read(filename, callback) {
   return fs.readFile(filename, function (err, data) {
-    if (err) {
-      return callback(err);
-    }
+    if (err) return callback(err);
 
     return zlib.gunzip(data, function (err, content) {
-      var result = {};
+      if (err) return callback(err);
 
-      if (err) {
-        return callback(err);
-      }
+      var result = {};
 
       try {
         result = JSON.parse(content);
@@ -62,9 +58,7 @@ var write = function write(filename, result, callback) {
   var content = JSON.stringify(result);
 
   return zlib.gzip(content, function (err, data) {
-    if (err) {
-      return callback(err);
-    }
+    if (err) return callback(err);
 
     return fs.writeFile(filename, data, callback);
   });

package/lib/index.js

@@ -4,11 +4,12 @@ var babel = require("babel-core");
 var loaderUtils = require("loader-utils");
 var path = require("path");
 var cache = require("./fs-cache.js");
-var exists = require("./utils/exists")();
+var exists = require("./utils/exists");
 var relative = require("./utils/relative");
-var read = require("./utils/read")();
+var read = require("./utils/read");
 var resolveRc = require("./resolve-rc.js");
 var pkg = require("../package.json");
+var fs = require("fs");
 
 /**
  * Error thrown by Babel formatted to conform to Webpack reporting.
@@ -47,7 +48,7 @@ var transpile = function transpile(source, options) {
   try {
     result = babel.transform(source, options);
   } catch (error) {
-    if (forceEnv) process.env.BABEL_ENV = tmpEnv;
+    if (forceEnv) restoreBabelEnv(tmpEnv);
     if (error.message && error.codeFrame) {
       var message = error.message;
       var name = void 0;
@@ -73,7 +74,7 @@ var transpile = function transpile(source, options) {
     map.sourcesContent = [source];
   }
 
-  if (forceEnv) process.env.BABEL_ENV = tmpEnv;
+  if (forceEnv) restoreBabelEnv(tmpEnv);
 
   return {
     code: code,
@@ -82,6 +83,14 @@ var transpile = function transpile(source, options) {
   };
 };
 
+function restoreBabelEnv(prevValue) {
+  if (prevValue === undefined) {
+    delete process.env.BABEL_ENV;
+  } else {
+    process.env.BABEL_ENV = prevValue;
+  }
+}
+
 function passMetadata(s, context, metadata) {
   if (context[s]) {
     context[s](metadata);
@@ -97,6 +106,16 @@ module.exports = function (source, inputSourceMap) {
 
   // Handle options
   var loaderOptions = loaderUtils.getOptions(this) || {};
+  var fileSystem = this.fs ? this.fs : fs;
+  var babelrcPath = null;
+  if (loaderOptions.babelrc !== false) {
+    babelrcPath = exists(fileSystem, loaderOptions.babelrc) ? loaderOptions.babelrc : resolveRc(fileSystem, path.dirname(filename));
+  }
+
+  if (babelrcPath) {
+    this.addDependency(babelrcPath);
+  }
+
   var defaultOptions = {
     metadataSubscribers: [],
     inputSourceMap: inputSourceMap,
@@ -105,7 +124,7 @@ module.exports = function (source, inputSourceMap) {
     cacheIdentifier: JSON.stringify({
       "babel-loader": pkg.version,
       "babel-core": babel.version,
-      babelrc: exists(loaderOptions.babelrc) ? read(loaderOptions.babelrc) : resolveRc(path.dirname(filename)),
+      babelrc: babelrcPath ? read(fileSystem, babelrcPath) : null,
       env: loaderOptions.forceEnv || process.env.BABEL_ENV || process.env.NODE_ENV || "development"
     })
   };

package/lib/resolve-rc.js

@@ -1,38 +1,26 @@
 "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")({});
+var exists = require("./utils/exists");
 
-var cache = {};
+module.exports = function find(fileSystem, start) {
+  var _arr = [".babelrc", ".babelrc.js", "package.json"];
 
-var find = function find(start, rel) {
-  var file = path.join(start, rel);
+  for (var _i = 0; _i < _arr.length; _i++) {
+    var fileName = _arr[_i];
+    var file = path.join(start, fileName);
 
-  if (exists(file)) {
-    return read(file);
+    if (exists(fileSystem, file)) {
+      if (fileName !== "package.json" || typeof require(file).babel === "object") {
+        return file;
+      }
+    }
   }
 
   var up = path.dirname(start);
-  if (up !== start) {
-    // Reached root
-    return find(up, rel);
-  }
-};
 
-module.exports = function (loc, rel) {
-  rel = rel || ".babelrc";
-  var cacheKey = loc + "/" + rel;
-  if (!(cacheKey in cache)) {
-    cache[cacheKey] = find(loc, rel);
+  // Reached root
+  if (up !== start) {
+    return find(fileSystem, up);
   }
-  return cache[cacheKey];
 };

package/lib/utils/exists.js

@@ -1,25 +1,11 @@
 "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 || {};
+module.exports = function (fileSystem, filename) {
+  var exists = false;
 
-  return function (filename) {
+  try {
+    exists = fileSystem.statSync(filename).isFile();
+  } catch (e) {}
 
-    if (!filename) {
-      return false;
-    }
-
-    cache[filename] = cache[filename] || fs.existsSync(filename);
-
-    return cache[filename];
-  };
+  return exists;
 };

package/lib/utils/read.js

@@ -1,25 +1,14 @@
 "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 || {};
+var path = require("path");
 
-  return function (filename) {
+module.exports = function readBabelConfig(fileSystem, filename) {
+  if (path.basename(filename) === "package.json") {
+    var pkg = require(filename);
 
-    if (!filename) {
-      throw new Error("filename must be a string");
-    }
+    return JSON.stringify(pkg.babel);
+  }
 
-    cache[filename] = cache[filename] || fs.readFileSync(filename, "utf8");
-
-    return cache[filename];
-  };
+  // Webpack `fs` return Buffer
+  return fileSystem.readFileSync(filename).toString("utf8");
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-loader",
-  "version": "7.0.0-alpha.3",
+  "version": "7.1.1",
   "description": "babel module loader for webpack",
   "files": [
     "lib"
@@ -10,16 +10,16 @@
     "node": ">=4"
   },
   "dependencies": {
-    "find-cache-dir": "^0.1.1",
+    "find-cache-dir": "^1.0.0",
     "loader-utils": "^1.0.2",
     "mkdirp": "^0.5.1"
   },
   "peerDependencies": {
     "babel-core": "6 || 7 || ^7.0.0-alpha || ^7.0.0-beta || ^7.0.0-rc",
-    "webpack": "2"
+    "webpack": "2 || 3"
   },
   "devDependencies": {
-    "ava": "^0.18.0",
+    "ava": "^0.19.0",
     "babel-cli": "^6.18.0",
     "babel-core": "^6.0.0",
     "babel-eslint": "^7.1.0",
@@ -27,27 +27,30 @@
     "babel-plugin-react-intl": "^2.1.3",
     "babel-preset-env": "^1.2.0",
     "babel-register": "^6.18.0",
-    "codecov": "^1.0.1",
-    "cross-env": "^3.1.4",
-    "eslint": "^3.8.1",
-    "eslint-config-babel": "^6.0.0",
+    "cross-env": "^5.0.0",
+    "eslint": "^4.1.0",
+    "eslint-config-babel": "^7.0.0",
     "eslint-plugin-flowtype": "^2.25.0",
-    "nyc": "^10.0.0",
+    "eslint-plugin-prettier": "^2.1.2",
+    "husky": "^0.14.0",
+    "lint-staged": "^4.0.0",
+    "nyc": "^11.0.1",
+    "prettier": "^1.2.2",
     "react": "^15.1.0",
     "react-intl": "^2.1.2",
     "react-intl-webpack-plugin": "^0.0.3",
     "rimraf": "^2.4.3",
-    "webpack": "^2.2.0"
+    "webpack": "^3.0.0"
   },
   "scripts": {
     "clean": "rimraf lib/",
     "build": "babel src/ --out-dir lib/",
-    "coverage": "nyc report --reporter=json && codecov -f coverage/coverage-final.json",
+    "format": "prettier --write --trailing-comma all \"src/**/*.js\" \"test/**/*.test.js\" \"test/helpers/*.js\" && prettier --write --trailing-comma es5 \"scripts/*.js\"",
     "lint": "eslint src test",
-    "preversion": "yarn run test",
+    "precommit": "lint-staged",
     "prepublish": "yarn run clean && yarn run build",
+    "preversion": "yarn run test",
     "test": "yarn run lint && cross-env BABEL_ENV=test yarn run build && yarn run test-only",
-    "test-ci": "cross-env BABEL_ENV=test yarn run build && yarn run test-only",
     "test-only": "nyc ava"
   },
   "repository": {
@@ -73,6 +76,10 @@
     "include": [
       "src/**/*.js"
     ],
+    "reporter": [
+      "text",
+      "json"
+    ],
     "require": [
       "babel-register"
     ],
@@ -89,5 +96,27 @@
       "src/**/*.js"
     ],
     "babel": "inherit"
+  },
+  "lint-staged": {
+    "scripts/*.js": [
+      "prettier --trailing-comma es5 --write",
+      "git add"
+    ],
+    "src/**/*.js": [
+      "prettier --trailing-comma all --write",
+      "git add"
+    ],
+    "test/**/*.test.js": [
+      "prettier --trailing-comma all --write",
+      "git add"
+    ],
+    "test/helpers/*.js": [
+      "prettier --trailing-comma all --write",
+      "git add"
+    ],
+    "package.json": [
+      "node ./scripts/yarn-install.js",
+      "git add yarn.lock"
+    ]
   }
 }