Merge branch 'master' into wip-0.8

sokra · sokra · commit 256b5720f68f · 2012-11-06T15:28:21.000+01:00
diff --git a/lib/parse.js b/lib/parse.js
@@ -251,6 +251,16 @@ function walkExpression(options, context, expression) {
 						column: elements[idx].loc.start.column,
 						inTry: context.inTry
 					});
+				} else if(param.value == "exports") {
+					// exports
+					context.requires = context.requires || [];
+					context.requires.push({
+						moduleExports: true,
+						expressionRange: elements[idx].range,
+						line: elements[idx].loc.start.line,
+						column: elements[idx].loc.start.column,
+						inTry: context.inTry
+					});
 				} else {
 					// normal require
 					context.requires = context.requires || [];
diff --git a/lib/writeSource.js b/lib/writeSource.js
@@ -95,6 +95,12 @@ module.exports = function(module, options, toRealId, toRealChuckId) {
 					to: requireItem.expressionRange[1],
 					value: "require"
 				});
+			} else if(requireItem.moduleExports) {
+				replaces.push({
+					from: requireItem.expressionRange[0],
+					to: requireItem.expressionRange[1],
+					value: "module.exports"
+				});
 			}
 			if(requireItem.amdNameRange) {
 				replaces.push({
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "webpack",
-	"version": "0.7.16",
+	"version": "0.7.17",
 	"author": "Tobias Koppers @sokra",
 	"description": "Packs CommonJs/AMD Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loading of js, json, jade, coffee, css, ... out of the box and more with custom loaders.",
 	"dependencies": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webpack",`
`3`		`- "version": "0.7.16",`
	`3`	`+ "version": "0.7.17",`
`4`	`4`	`"author": "Tobias Koppers @sokra",`
`5`	`5`	`"description": "Packs CommonJs/AMD Modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loading of js, json, jade, coffee, css, ... out of the box and more with custom loaders.",`
`6`	`6`	`"dependencies": {`