refactor(es6): Replace object-assign polyfill with native method (webpack#3608)

jdb8 · TheLarkInn · commit a8bb6cdb1ce7 · 2016-12-28T13:07:28.000-06:00
diff --git a/lib/Compiler.js b/lib/Compiler.js
@@ -3,7 +3,6 @@
 	Author Tobias Koppers @sokra
 */
 var path = require("path");
-var assign = require("object-assign");
 var Tapable = require("tapable");
 
 var Compilation = require("./Compilation");
@@ -23,7 +22,7 @@ function Watching(compiler, watchOptions, handler) {
 			aggregateTimeout: watchOptions
 		};
 	} else if(watchOptions && typeof watchOptions === "object") {
-		this.watchOptions = assign({}, watchOptions);
+		this.watchOptions = Object.assign({}, watchOptions);
 	} else {
 		this.watchOptions = {};
 	}
diff --git a/lib/NodeStuffPlugin.js b/lib/NodeStuffPlugin.js
@@ -2,7 +2,6 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var objectAssign = require('object-assign');
 var path = require("path");
 var ModuleParserHelpers = require("./ModuleParserHelpers");
 var ConstDependency = require("./dependencies/ConstDependency");
@@ -28,7 +27,7 @@ NodeStuffPlugin.prototype.apply = function(compiler) {
 
 			var localOptions = options;
 			if(parserOptions.node)
-				localOptions = objectAssign({}, localOptions, parserOptions.node);
+				localOptions = Object.assign({}, localOptions, parserOptions.node);
 
 			function ignore() {
 				return true;
diff --git a/lib/NormalModuleFactory.js b/lib/NormalModuleFactory.js
@@ -3,7 +3,6 @@
 	Author Tobias Koppers @sokra
 */
 var async = require("async");
-var objectAssign = require('object-assign');
 var Tapable = require("tapable");
 var NormalModule = require("./NormalModule");
 var RawModule = require("./RawModule");
@@ -265,7 +264,7 @@ NormalModuleFactory.prototype.resolveRequestArray = function resolveRequestArray
 			var optionsOnly = item.options ? {
 				options: item.options
 			} : undefined;
-			return callback(null, objectAssign({}, item, identToLoaderRequest(result), optionsOnly));
+			return callback(null, Object.assign({}, item, identToLoaderRequest(result), optionsOnly));
 		});
 	}, callback);
 };
diff --git a/lib/WebpackOptionsApply.js b/lib/WebpackOptionsApply.js
@@ -2,7 +2,6 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var assign = require("object-assign");
 var OptionsApply = require("./OptionsApply");
 
 var LoaderTargetPlugin = require("./LoaderTargetPlugin");
@@ -280,14 +279,14 @@ WebpackOptionsApply.prototype.process = function(options, compiler) {
 
 	compiler.applyPlugins("after-plugins", compiler);
 	if(!compiler.inputFileSystem) throw new Error("No input filesystem provided");
-	compiler.resolvers.normal = ResolverFactory.createResolver(assign({
+	compiler.resolvers.normal = ResolverFactory.createResolver(Object.assign({
 		fileSystem: compiler.inputFileSystem
 	}, options.resolve));
-	compiler.resolvers.context = ResolverFactory.createResolver(assign({
+	compiler.resolvers.context = ResolverFactory.createResolver(Object.assign({
 		fileSystem: compiler.inputFileSystem,
 		resolveToContext: true
 	}, options.resolve));
-	compiler.resolvers.loader = ResolverFactory.createResolver(assign({
+	compiler.resolvers.loader = ResolverFactory.createResolver(Object.assign({
 		fileSystem: compiler.inputFileSystem
 	}, options.resolveLoader));
 	compiler.applyPlugins("after-resolvers", compiler);
diff --git a/lib/node/NodeSourcePlugin.js b/lib/node/NodeSourcePlugin.js
@@ -4,7 +4,6 @@
 */
 var path = require('path');
 var AliasPlugin = require("enhanced-resolve/lib/AliasPlugin");
-var objectAssign = require('object-assign');
 var ModuleParserHelpers = require("../ModuleParserHelpers");
 var nodeLibsBrowser = require("node-libs-browser");
 
@@ -50,7 +49,7 @@ NodeSourcePlugin.prototype.apply = function(compiler) {
 
 			var localOptions = options;
 			if(parserOptions.node)
-				localOptions = objectAssign({}, localOptions, parserOptions.node);
+				localOptions = Object.assign({}, localOptions, parserOptions.node);
 
 			if(localOptions.global) {
 				parser.plugin("expression global", function() {
diff --git a/package.json b/package.json
@@ -17,7 +17,6 @@
     "memory-fs": "~0.3.0",
     "mkdirp": "~0.5.0",
     "node-libs-browser": "^2.0.0",
-    "object-assign": "^4.0.1",
     "source-map": "^0.5.3",
     "supports-color": "^3.1.0",
     "tapable": "~0.2.5",
diff --git a/test/cases/loaders/issue-2299/loader/index.js b/test/cases/loaders/issue-2299/loader/index.js
@@ -1,6 +1,5 @@
 var path = require('path');
 var async = require('async');
-var assign = require('object-assign');
 module.exports = function(content) {
 	var cb = this.async();
 	var json = JSON.parse(content);
@@ -20,7 +19,7 @@ module.exports = function(content) {
 			}
 			// Combine all the results into one object and return it
 			cb(null, 'module.exports = ' + JSON.stringify(results.reduce(function(prev, result) {
-				return assign({}, prev, result);
+				return Object.assign({}, prev, result);
 			}, json)));
 		}
 	);
