babel-loader 6.3.0 → 6.4.1

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## v6.4.0
+
+### 🚀 New Feature
+
+- added metadata passing from babel to webpack, which is currently used by react-intl (#398) @Ognian
+
+## v6.3.2
+
+### 😢 Regression
+
+- `forceEnv` was interfering with regular environment handling
+
+## v6.3.1
+
+### 🐛 Bug Fix
+
+ - The new `forceEnv` options wasn't working as expected (#379) @chrisvasz
+
+## v6.3.0
+
+### 🚀 New Feature
+
+- Add new config option `forceEnv` (#368) @moimael
+
+Allow to override BABEL_ENV/NODE_ENV at loader-level. Useful for isomorphic applications which have   separate babel config for client and server.
+
+### 🐛 Bug Fix
+
+- Update loader-utils dependency to ^0.2.16 to fix compatibility with webpack 2 (#371) @leonaves
+
+### 💅 Polish
+
+- Improve FS caching to do less sync calls which improves performance slightly (#375) @akx 
+
 ## v6.2.10
 
 Support for webpack 2.2-rc has been added in this release

package/README.md

@@ -12,13 +12,13 @@
 ## Installation
 
 ```bash
-npm install babel-loader babel-core babel-preset-es2015 webpack --save-dev
+npm install babel-loader babel-core babel-preset-env webpack --save-dev
 ```
 
 or
 
 ```bash
-yarn add babel-loader babel-core babel-preset-es2015 webpack --dev
+yarn add babel-loader babel-core babel-preset-env webpack --dev
 ```
 
 __Note:__ [npm](https://npmjs.com) deprecated [auto-installing of peerDependencies](https://github.com/npm/npm/issues/6565) since npm@3, so required peer dependencies like babel-core and webpack must be listed explicitly in your `package.json`.
@@ -39,7 +39,7 @@ module: {
       exclude: /(node_modules|bower_components)/,
       loader: 'babel-loader',
       query: {
-        presets: ['es2015']
+        presets: ['env']
       }
     }
   ]
@@ -58,7 +58,7 @@ module: {
     {
       test: /\.js$/,
       exclude: /(node_modules|bower_components)/,
-      loader: 'babel-loader?presets[]=es2015'
+      loader: 'babel-loader?presets[]=env'
     }
   ]
 }
@@ -74,13 +74,32 @@ module: {
       exclude: /(node_modules|bower_components)/,
       loader: 'babel-loader',
       query: {
-        presets: ['es2015']
+        presets: ['env']
       }
     }
   ]
 }
   ```
 
+  or by using global options:
+  
+  > Be aware that this only works in webpack 1 and not in version 2.
+
+  ```javascript
+module: {
+  loaders: [
+    {
+      test: /\.js$/,
+      exclude: /(node_modules|bower_components)/,
+      loader: 'babel-loader'
+    }
+  ]
+},
+babel: {
+  presets: ['es2015']
+}
+  ```
+
   This loader also supports the following loader-specific option:
 
   * `cacheDirectory`: Default `false`. When set, the given directory will be used to cache the results of the loader. Future webpack builds will attempt to read from the cache to avoid needing to run the potentially expensive Babel recompilation process on each run. If the value is blank (`loader: 'babel-loader?cacheDirectory'`) or `true` (`loader: babel-loader?cacheDirectory=true`) the loader will use the default cache directory in `node_modules/.cache/babel-loader` or fallback to the default OS temporary file directory if no `node_modules` folder could be found in any root directory.
@@ -129,7 +148,7 @@ loaders: [
     exclude: /(node_modules|bower_components)/,
     loader: 'babel-loader',
     query: {
-      presets: ['es2015'],
+      presets: ['env'],
       plugins: ['transform-runtime']
     }
   }

package/lib/index.js

@@ -31,10 +31,21 @@ var formatMessage = function formatMessage(name, message, codeFrame) {
 };
 
 var transpile = function transpile(source, options) {
+  var forceEnv = options.forceEnv;
+  var tmpEnv = void 0;
+
+  delete options.forceEnv;
+
+  if (forceEnv) {
+    tmpEnv = process.env.BABEL_ENV;
+    process.env.BABEL_ENV = forceEnv;
+  }
+
   var result = void 0;
   try {
     result = babel.transform(source, options);
   } catch (error) {
+    if (forceEnv) restoreBabelEnv(tmpEnv);
     if (error.message && error.codeFrame) {
       var message = error.message;
       var name = void 0;
@@ -54,19 +65,37 @@ var transpile = function transpile(source, options) {
   }
   var code = result.code;
   var map = result.map;
+  var metadata = result.metadata;
 
   if (map && (!map.sourcesContent || !map.sourcesContent.length)) {
     map.sourcesContent = [source];
   }
 
+  if (forceEnv) restoreBabelEnv(tmpEnv);
+
   return {
     code: code,
-    map: map
+    map: map,
+    metadata: metadata
   };
 };
 
+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);
+  }
+}
+
 module.exports = function (source, inputSourceMap) {
-  var result = {};
+  var _this = this;
 
   var webpackRemainingChain = loaderUtils.getRemainingRequest(this).split("!");
   var filename = webpackRemainingChain[webpackRemainingChain.length - 1];
@@ -75,6 +104,7 @@ module.exports = function (source, inputSourceMap) {
   var loaderOptions = loaderUtils.parseQuery(this.query);
   var userOptions = assign({}, globalOptions, loaderOptions);
   var defaultOptions = {
+    metadataSubscribers: [],
     inputSourceMap: inputSourceMap,
     sourceRoot: process.cwd(),
     filename: filename,
@@ -82,12 +112,10 @@ module.exports = function (source, inputSourceMap) {
       "babel-loader": pkg.version,
       "babel-core": babel.version,
       babelrc: exists(userOptions.babelrc) ? read(userOptions.babelrc) : resolveRc(path.dirname(filename)),
-      env: userOptions.forceEnv || process.env.BABEL_ENV || process.env.NODE_ENV
+      env: userOptions.forceEnv || process.env.BABEL_ENV || process.env.NODE_ENV || "development"
     })
   };
 
-  delete userOptions.forceEnv;
-
   var options = assign({}, defaultOptions, userOptions);
 
   if (userOptions.sourceMap === undefined) {
@@ -100,9 +128,11 @@ module.exports = function (source, inputSourceMap) {
 
   var cacheDirectory = options.cacheDirectory;
   var cacheIdentifier = options.cacheIdentifier;
+  var metadataSubscribers = options.metadataSubscribers;
 
   delete options.cacheDirectory;
   delete options.cacheIdentifier;
+  delete options.metadataSubscribers;
 
   this.cacheable();
 
@@ -114,14 +144,30 @@ module.exports = function (source, inputSourceMap) {
       source: source,
       options: options,
       transform: transpile
-    }, function (err, result) {
-      if (err) {
-        return callback(err);
-      }
-      return callback(null, result.code, result.map);
+    }, function (err) {
+      var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+          code = _ref.code,
+          map = _ref.map,
+          metadata = _ref.metadata;
+
+      if (err) return callback(err);
+
+      metadataSubscribers.forEach(function (s) {
+        return passMetadata(s, _this, metadata);
+      });
+
+      return callback(null, code, map);
     });
   }
 
-  result = transpile(source, options);
-  this.callback(null, result.code, result.map);
+  var _transpile = transpile(source, options),
+      code = _transpile.code,
+      map = _transpile.map,
+      metadata = _transpile.metadata;
+
+  metadataSubscribers.forEach(function (s) {
+    return passMetadata(s, _this, metadata);
+  });
+
+  this.callback(null, code, map);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-loader",
-  "version": "6.3.0",
+  "version": "6.4.1",
   "description": "babel module loader for webpack",
   "files": [
     "lib"
@@ -22,6 +22,7 @@
     "babel-core": "^6.0.0",
     "babel-eslint": "^7.1.0",
     "babel-plugin-istanbul": "^3.0.0",
+    "babel-plugin-react-intl": "^2.1.3",
     "babel-preset-es2015": "^6.0.0",
     "babel-preset-latest": "^6.16.0",
     "babel-register": "^6.18.0",
@@ -31,6 +32,9 @@
     "eslint-config-babel": "^6.0.0",
     "eslint-plugin-flowtype": "^2.25.0",
     "nyc": "^10.0.0",
+    "react": "^15.1.0",
+    "react-intl": "^2.1.2",
+    "react-intl-webpack-plugin": "^0.0.3",
     "rimraf": "^2.4.3",
     "webpack": "^2.2.0-rc"
   },