Merge branch 'hotfix/5.3.1' into develop

babel · Jul 4, 2015 · 719eb70 · 719eb70
2 parents 6b33020 + edf2bc3
commit 719eb70
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v5.3.1
+
+  * Merge [PR #82](https://github.com/babel/babel-loader/pull/82) - Fallback global options to empty object to avoid conflicts with object-assign polyfill.
+
 ## v5.3.0
 
   * Merge [PR #79](https://github.com/babel/babel-loader/pull/79) - This should allow babel-loader to work with [enhanced-require](https://github.com/webpack/enhanced-require).

diff --git a/index.js b/index.js
@@ -35,7 +35,7 @@ module.exports = function(source, inputSourceMap) {
       babelrc: babelrc || '',
     }),
   };
-  var globalOptions = this.options.babel;
+  var globalOptions = this.options.babel || {};
   var loaderOptions = loaderUtils.parseQuery(this.query);
   var options = assign({}, defaultOptions, globalOptions, loaderOptions);
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-loader",
-  "version": "5.3.0",
+  "version": "5.3.1",
   "description": "babel module loader for webpack",
   "main": "index.js",
   "dependencies": {