Merge branch 'master' into wip-0.8

sokra · sokra · commit cbf909e9db7e · 2012-11-05T09:43:28.000+01:00
Conflicts:
	lib/buildModule.js
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+* text=auto
+bin/* eol=lf
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,4 @@
-language: node_js
-node_js:
-  - 0.6
+language: node_js
+node_js:
+  - 0.6
   - 0.8
diff --git a/README.md b/README.md
@@ -680,7 +680,7 @@ You are also welcome to correct any spelling mistakes or any language issues, be
 
 ## Future plans
 
-see [https://github.com/webpack/webpack/wiki/Ideas](wiki Ideas)
+see [wiki Ideas](https://github.com/webpack/webpack/wiki/Ideas)
 
 
 
diff --git a/examples/loader/test.json b/examples/loader/test.json
@@ -1,3 +1,3 @@
-{
-	"foobar": 1234
+{
+	"foobar": 1234
 }
diff --git a/lib/buildModule.js b/lib/buildModule.js
@@ -85,7 +85,7 @@ function buildModule(context, request,
 		try {
 			deps = parse(source, options.parse);
 		} catch(e) {
-			callback(new Error("File \"" + request + "\" parsing failed: " + e), extraResults);
+			callback(new Error("File \"" + request + "\" parsing failed: " + e.stack), extraResults);
 			return;
 		}
 		profile && (profile.end = new Date().getTime());
diff --git a/lib/parse.js b/lib/parse.js
@@ -81,8 +81,8 @@ function walkStatement(options, context, statement) {
 
 	// Declarations
 	case "FunctionDeclaration":
-		if(options.overwrites.hasOwnProperty(statement.name)) {
-			context.overwrite.push(statement.name);
+		if(options.overwrites.hasOwnProperty(statement.id.name)) {
+			context.overwrite.push(statement.id.name);
 		}
 		var oldInTry = context.inTry;
 		context.inTry = false;
@@ -173,6 +173,11 @@ function walkExpression(options, context, expression) {
 			expression.argument.type === "Identifier" &&
 			expression.argument.name === "require")
 			break;
+		if(expression.operator === "typeof" &&
+			expression.argument &&
+			expression.argument.type === "Identifier" &&
+			expression.argument.name === "module")
+			break;
 		walkExpression(options, context, expression.argument);
 		break;
 	case "BinaryExpression":
@@ -351,6 +356,7 @@ function walkExpression(options, context, expression) {
 			expression.arguments.length == 1 &&
 			expression.callee.type === "Identifier" &&
 			expression.callee.name === "define") {
+			context.requires = context.requires || [];
 			context.requires.push({
 				name: "__webpack_amd_define",
 				append: "(module)",
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "webpack",
-	"version": "0.7.12",
+	"version": "0.7.16",
 	"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": {
diff --git a/test/browsertest/resources/script.coffee b/test/browsertest/resources/script.coffee
@@ -1,5 +1,5 @@
-condition = true
-obj = 
-	text: "coffee test"
-
+condition = true
+obj = 
+	text: "coffee test"
+
 module.exports = obj.text if condition?

Original file line number	Diff line number	Diff line change
`@@ -680,7 +680,7 @@ You are also welcome to correct any spelling mistakes or any language issues, be`
`680`	`680`
`681`	`681`	`## Future plans`
`682`	`682`
`683`		`-see [https://github.com/webpack/webpack/wiki/Ideas](wiki Ideas)`
	`683`	`+see [wiki Ideas](https://github.com/webpack/webpack/wiki/Ideas)`
`684`	`684`
`685`	`685`
`686`	`686`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-{`
`2`		`- "foobar": 1234`
	`1`	`+{`
	`2`	`+ "foobar": 1234`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ function buildModule(context, request,`
`85`	`85`	`try {`
`86`	`86`	`deps = parse(source, options.parse);`
`87`	`87`	`} catch(e) {`
`88`		`- callback(new Error("File \"" + request + "\" parsing failed: " + e), extraResults);`
	`88`	`+ callback(new Error("File \"" + request + "\" parsing failed: " + e.stack), extraResults);`
`89`	`89`	`return;`
`90`	`90`	`}`
`91`	`91`	`profile && (profile.end = new Date().getTime());`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webpack",`
`3`		`- "version": "0.7.12",`
	`3`	`+ "version": "0.7.16",`
`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": {`