bugfixes and optimize

buildin/__webpack_console.js

@@ -1,3 +1,4 @@
+var console = window.console;
 exports.log = (console && console.log) || function() {};
 exports.info = (console && console.info) || function() {};
 exports.error = (console && console.error) || function() {};
@@ -11,9 +12,4 @@ exports.timeEnd = (console && console.timeEnd) || function() {
 	exports.log('%s: %dms', label, duration);
 };
 exports.trace = (console && console.trace) || function() {};
-exports.assert = (console && console.assert) || function() {
-	if (!expression) {
-		var arr = Array.prototype.slice.call(arguments, 1);
-		require('assert').ok(false, util.format.apply(this, arr));
-	}
-};
+exports.assert = (console && console.assert) || function() {};

buildin/__webpack_global.js

@@ -0,0 +1 @@
+module.exports = window;

lib/parse.js

@@ -115,8 +115,9 @@ function walkVariableDeclarators(context, declarators) {
 	declarators.forEach(function(declarator) {
 		switch(declarator.type) {
 		case "VariableDeclarator":
-			if(declarator.name in context.options.overwrites) {
-				context.overwrite.push(declarator.name);
+			if(declarator.id.type === "Identifier" &&
+				declarator.id.name in context.options.overwrites) {
+				context.overwrite.push(declarator.id.name);
 			}
 			if(declarator.init)
 				walkExpression(context, declarator.init);

lib/webpack.js

@@ -58,6 +58,8 @@ module.exports = function(context, moduleName, options, callback) {
 	options.parse.overwrites = options.parse.overwrites || {};
 	options.parse.overwrites.process = options.parse.overwrites.process || ("__webpack_process");
 	options.parse.overwrites.module = options.parse.overwrites.module || ("__webpack_module");
+	options.parse.overwrites.console = options.parse.overwrites.console || ("__webpack_console");
+	options.parse.overwrites.global = options.parse.overwrites.global || ("__webpack_global");
 	options.resolve = options.resolve || {};
 	options.resolve.paths = options.resolve.paths || [];
 	options.resolve.paths.unshift(path.join(path.dirname(__dirname), "buildin"));

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "webpack",
-	"version": "0.2.3",
+	"version": "0.2.4",
 	"author": "Tobias Koppers @sokra",
 	"description": "Packs CommonJs Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand.",
 	"dependencies": {

test/browsertest/lib/index.web.js

@@ -43,6 +43,15 @@ require.ensure([], function(require) {
 		sum2++;
 	});
 	process.emit("xyz");
+	window.test(window === global, "window === global");
+	(function() {
+		var require = 123;
+		window.test(require === 123, "overwrite require via variable should be ok");
+	}());
+	(function() {
+		var module = 1233;
+		window.test(module === 1233, "overwrite module via variable should be ok");
+	}());
 });
 
 require.ensure([], function(require) {