webpack - npm Package Compare versions

Comparing version 0.6.0 to 0.6.1

lib/parse.js

@@ -424,3 +424,4 @@ /*
 					name: param.value,
-					expressionRange: [expression.callee.range[0], expression.range[1]],
+					idOnly: true,
+					expressionRange: expression.arguments[0].range,
 					line: expression.loc.start.line,
@@ -488,3 +489,4 @@ column: expression.loc.start.column
 				name: param,
-				expressionRange: [expression.callee.range[0], expression.range[1]],
+				expressionRange: expression.arguments[0].range,
+				calleeRange: expression.callee.range,
 				line: expression.loc.start.line,
@@ -525,2 +527,3 @@ column: expression.loc.start.column
 					idOnly: true,
+					brackets: true,
 					line: expression.loc.start.line,
@@ -527,0 +530,0 @@ column: expression.loc.start.column

lib/writeSource.js

@@ -51,3 +51,6 @@ /*
 						to: requireItem.expressionRange[1],
-						value: (requireItem.idOnly ? "" : "require") + "(" + prefix + toRealId(requireItem.id) + ")" + (requireItem.append || "")
+						value: (!requireItem.idOnly ? "require(" : requireItem.brackets ? "(" : "") +
+							prefix + toRealId(requireItem.id) +
+							(requireItem.idOnly && !requireItem.brackets ? "" : ")") +
+							(requireItem.append || "")
 					});
@@ -98,3 +101,3 @@ } else if(requireItem.valueRange) {
 				});
-				if(contextItem.replace)
+				if(contextItem.replace) {
 					replaces.push({
@@ -105,2 +108,3 @@ from: contextItem.replace[0][0],
 					});
+				}
 			} else if(contextItem.valueRange) {
@@ -133,8 +137,15 @@ replaces.push({
 				}
-			} else {
+			} else if(contextItem.expressionRange) {
 				replaces.push({
 					from: contextItem.expressionRange[0],
 					to: contextItem.expressionRange[1],
-					value: "require(" + prefix + (((contextItem.id && toRealId(contextItem.id)) || JSON.stringify("context: " + contextItem.name || "context failed")) + "") + ")" + postfix
+					value: "(" + prefix + (((contextItem.id && toRealId(contextItem.id)) || JSON.stringify("context: " + contextItem.name || "context failed")) + "") + ")" + postfix
 				});
+				if(contextItem.calleeRange) {
+					replaces.push({
+						from: contextItem.calleeRange[0],
+						to: contextItem.calleeRange[1],
+						value: "require"
+					});
+				}
 			}
@@ -141,0 +152,0 @@ }

package.json

 {
 	"name": "webpack",
-	"version": "0.6.0",
+	"version": "0.6.1",
 	"author": "Tobias Koppers @sokra",
@@ -5,0 +5,0 @@ "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.",

test/browsertest/lib/index.web.js

@@ -6,2 +6,4 @@ // Should not break it... should not include complete directory...
 window.test(true, "index.js should be replaced with index.web.js");
+window.test(new(require("./constructor"))(1234).value == 1234, "Parse require in new(...) should work");
+window.test(new ( require ( "./constructor" ) ) ( 1234 ) .value == 1234, "Parse require in new(...) should work, with spaces");
 require("script!../js/libary1.js");
@@ -23,2 +25,3 @@ window.test(window.libary1, "libary1 loaded");
 window.test(require("./singluar.js").value === 1, "sigular module loaded");
+window.test((require("./singluar.js")).value === 1, "sigular module loaded, in brackets");
 require("./sing" + "luar.js").value = 2;
@@ -28,2 +31,4 @@ window.test(require("./singluar").value === 2, "exported object is singluar");
 window.test(require.context("../templates")("./tmpl") === "test template", "Context should work");
+window.test((require.context("../templates"))("./tmpl") === "test template", "Context should work, in brackets");
+window.test((require.context("../templates")("./tmpl")) === "test template", "Context should work, in brackets2");
 window.test(require . context ( "." + "." + "/" + "templ" + "ates" ) ( "./subdir/tmpl.js" ) === "subdir test template", "Context should work with subdirectories and splitted");
@@ -30,0 +35,0 @@ var template = "tmpl", templateFull = "./tmpl.js";

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

354690

increased by0.28%

Number of package files

145

increased by0.69%

Lines of code

8725

increased by0.24%

No dependency changes