updated deps, minor changes

sokra · sokra · commit a979874cd05f · 2015-01-17T23:43:25.000+01:00
diff --git a/lib/Compiler.js b/lib/Compiler.js
@@ -3,7 +3,6 @@
 	Author Tobias Koppers @sokra
 */
 var path = require("path");
-var clone = require("clone");
 var Tapable = require("tapable");
 
 var Compilation = require("./Compilation");
@@ -333,7 +332,8 @@ Compiler.prototype.createChildCompiler = function(compilation, compilerName, out
 	childCompiler.contextTimestamps = this.contextTimestamps;
 	if(!this.records[compilerName]) this.records[compilerName] = [];
 	this.records[compilerName].push(childCompiler.records = {});
-	childCompiler.options = clone(this.options);
+	childCompiler.options = Object.create(this.options);
+	childCompiler.options.output = Object.create(childCompiler.options.output);
 	for(var name in outputOptions) {
 		childCompiler.options.output[name] = outputOptions[name];
 	}
diff --git a/lib/EvalSourceMapDevToolModuleTemplatePlugin.js b/lib/EvalSourceMapDevToolModuleTemplatePlugin.js
@@ -2,8 +2,6 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var clone = require("clone");
-
 var RawSource = require("webpack-core/lib/RawSource");
 var ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
 
@@ -21,11 +19,16 @@ EvalSourceMapDevToolModuleTemplatePlugin.prototype.apply = function(moduleTempla
 			return source.__EvalSourceMapDevTool_Data;
 		var content = source.source();
 
-		// Clone the sourcemap to ensure that the mutations below do not persist.
-		var sourceMap = clone(source.map());
+		var sourceMap = source.map();
 		if(!sourceMap) {
 			return source;
 		}
+
+		// Clone (flat) the sourcemap to ensure that the mutations below do not persist.
+		sourceMap = Object.keys(sourceMap).reduce(function(obj, key) {
+			obj[key] = sourceMap[key];
+			return obj;
+		}, {});
 		var modules = sourceMap.sources.map(function(source) {
 			var module = self.compilation.findModule(source);
 			return module || source;
diff --git a/lib/node/NodeWatchFileSystem.js b/lib/node/NodeWatchFileSystem.js
@@ -36,6 +36,7 @@ NodeWatchFileSystem.prototype.watch = function watch(files, dirs, missing, start
 
 	if(callbackUndelayed)
 		this.watcher.once("change", callbackUndelayed);
+
 	this.watcher.once("aggregated", function(changes) {
 		if(this.inputFileSystem && this.inputFileSystem.purge) {
 			this.inputFileSystem.purge(changes);
diff --git a/package.json b/package.json
@@ -24,22 +24,22 @@
 		}
 	],
 	"devDependencies": {
-		"mocha": "~1.21.1",
-		"should": "~4.0.4",
+		"mocha": "~2.1.0",
+		"should": "^4.6.0",
 		"vm-browserify": "~0.0.0",
 		"express": "~3.4.8",
 		"webpack-dev-middleware": "^1.0.0",
 		"worker-loader": "~0.5.0",
 		"raw-loader": "~0.5.0",
 		"json-loader": "~0.5.1",
-		"jade-loader": "~0.6.1",
+		"jade-loader": "~0.7.0",
 		"coffee-loader": "~0.7.1",
 		"css-loader": "~0.9.0",
-		"less-loader": "~0.7.0",
+		"less-loader": "^2.0.0",
 		"style-loader": "~0.8.0",
 		"script-loader": "~0.6.0",
 		"bundle-loader": "~0.5.0",
-		"file-loader": "~0.7.2",
+		"file-loader": "~0.8.0",
 		"url-loader": "~0.5.0",
 		"val-loader": "~0.5.0",
 		"i18n-webpack-plugin": "~0.2.0",
