Skip to content

Commit 9c5c6df

Browse files
MarkusKramerTheLarkInn
authored andcommitted
replaced calls to Object.assign with objectAssign to support node 0.12.x (webpack#3080)
1 parent 557d4af commit 9c5c6df

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

lib/NodeStuffPlugin.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
MIT License http://www.opensource.org/licenses/mit-license.php
33
Author Tobias Koppers @sokra
44
*/
5+
var objectAssign = require('object-assign');
56
var path = require("path");
67
var ModuleParserHelpers = require("./ModuleParserHelpers");
78
var ConstDependency = require("./dependencies/ConstDependency");
@@ -27,7 +28,7 @@ NodeStuffPlugin.prototype.apply = function(compiler) {
2728

2829
var localOptions = options;
2930
if(parserOptions.node)
30-
localOptions = Object.assign({}, localOptions, parserOptions.node);
31+
localOptions = objectAssign({}, localOptions, parserOptions.node);
3132

3233
function ignore() {
3334
return true;

lib/NormalModuleFactory.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Author Tobias Koppers @sokra
44
*/
55
var async = require("async");
6-
6+
var objectAssign = require('object-assign');
77
var Tapable = require("tapable");
88
var NormalModule = require("./NormalModule");
99
var RawModule = require("./RawModule");
@@ -214,7 +214,7 @@ NormalModuleFactory.prototype.resolveRequestArray = function resolveRequestArray
214214
async.map(array, function(item, callback) {
215215
resolver.resolve(contextInfo, context, item.loader, function(err, result) {
216216
if(err) return callback(err);
217-
return callback(null, Object.assign({}, item, {
217+
return callback(null, objectAssign({}, item, {
218218
loader: result
219219
}));
220220
});

lib/node/NodeSourcePlugin.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
Author Tobias Koppers @sokra
44
*/
55
var AliasPlugin = require("enhanced-resolve/lib/AliasPlugin");
6+
var objectAssign = require('object-assign');
67
var ModuleParserHelpers = require("../ModuleParserHelpers");
78
var nodeLibsBrowser = require("node-libs-browser");
89

@@ -31,7 +32,7 @@ NodeSourcePlugin.prototype.apply = function(compiler) {
3132

3233
var localOptions = options;
3334
if(parserOptions.node)
34-
localOptions = Object.assign({}, localOptions, parserOptions.node);
35+
localOptions = objectAssign({}, localOptions, parserOptions.node);
3536

3637
if(localOptions.process) {
3738
var processType = localOptions.process;

0 commit comments

Comments
 (0)