fixed polyfill in client code

sokra · sokra · commit ef17f69cfa18 · 2012-03-21T12:41:03.000+01:00
diff --git a/lib/parse.js b/lib/parse.js
@@ -160,11 +160,16 @@ function walkExpression(context, expression) {
 		walkExpression(context, expression.argument);
 		break;
 	case "BinaryExpression":
-	case "AssignmentExpression":
 	case "LogicalExpression":
 		walkExpression(context, expression.left);
 		walkExpression(context, expression.right);
 		break;
+	case "AssignmentExpression":
+		if(expression.left.type !== "Identifier" ||
+			expression.left.name !== "require")
+			walkExpression(context, expression.left);
+		walkExpression(context, expression.right);
+		break;
 	case "ConditionalExpression":
 		walkExpression(context, expression.test);
 		walkExpression(context, expression.alternate);
@@ -277,6 +282,15 @@ function walkExpression(context, expression) {
 			context.contexts.push(newContext);
 			noCallee = true;
 		}
+		if(context.overwrite.indexOf("require") === -1 &&
+			expression.callee &&
+			expression.callee.type === "MemberExpression" &&
+			expression.callee.object.type === "Identifier" &&
+			expression.callee.object.name === "require" &&
+			expression.callee.property.type === "Identifier" &&
+			expression.callee.property.name in {valueOf:1}) {
+			noCallee = true;
+		}
 
 		if(expression.callee && !noCallee)
 			walkExpression(context, expression.callee);
diff --git a/require-polyfill.js b/require-polyfill.js
@@ -1,9 +1,19 @@
 // Polyfill for node.js
-//  adds require.ensure
-//  call it like this: require("webpack/require-polyfill")(require);
-// This is only required when you want to use require.ensure or require.context
+//  - adds require.ensure
+//  - adds require.context
+//  call it like this: 
+//   require = require("webpack/require-polyfill")(require.valueOf());
+// This is only required when you want to use the special require.xxx methods
 //  in server-side code which should be so only in rar cases.
 module.exports = function(req) {
+	if(!req.webpackPolyfill) {
+		var oldReq = req;
+		req = function(name) {
+			return oldReq(name);
+		};
+		req.__proto__ = oldReq;
+		req.webpackPolyfill = true;
+	}
 	if(!req.ensure) {
 		req.ensure = function(array, callback) {
 			callback(req);
@@ -16,4 +26,5 @@ module.exports = function(req) {
 			}
 		}
 	}
+	return req;
 }
diff --git a/require-polyfill.web.js b/require-polyfill.web.js
@@ -1,2 +1,2 @@
 // No polyfill needed when compiled with webpack
-module.exports = function(){}
+module.exports = function(r){return r}
diff --git a/test/browsertest/lib/index.web.js b/test/browsertest/lib/index.web.js
@@ -1,3 +1,6 @@
+// Should not break it... should not include complete directory...
+require = require("../../../require-polyfill")(require.valueOf());
+
 window.test(true, "index.js should be replaced with index.web.js");
 window.test(window.libary1, "libary1 loaded");
 window.test(window.libary2.ok, "libary2 loaded");

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`// No polyfill needed when compiled with webpack`
`2`		`-module.exports = function(){}`
	`2`	`+module.exports = function(r){return r}`