bug fix when no require.e is in the bundle

sokra · sokra · commit 95096d69f3b9 · 2014-02-12T08:58:41.000+01:00
diff --git a/lib/dependencies/AMDRequireDependency.js b/lib/dependencies/AMDRequireDependency.js
@@ -17,7 +17,7 @@ AMDRequireDependency.Template = function AMDRequireDependencyTemplate() {};
 
 AMDRequireDependency.Template.prototype.apply = function(dep, source, outputOptions, requestShortener) {
 	var depBlock = dep.block;
-	var chunkId = depBlock.chunk && depBlock.chunk.id;
+	var chunkId = depBlock.chunk && !depBlock.chunk.entry && depBlock.chunk.id;
 	if(depBlock.arrayRange && !depBlock.functionRange) {
 		if(typeof chunkId === "number") {
 			source.replace(depBlock.range[0], depBlock.arrayRange[0]-1,
diff --git a/lib/dependencies/RequireEnsureDependency.js b/lib/dependencies/RequireEnsureDependency.js
@@ -23,7 +23,7 @@ RequireEnsureDependency.Template.prototype.apply = function(dep, source, outputO
 		if(outputOptions.pathinfo) comment = "/*! " + requestShortener.shorten(depBlock.chunkName) + " */ ";
 		source.replace(depBlock.chunkNameRange[0], depBlock.chunkNameRange[1]-1, comment + "0");
 	}
-	if(depBlock.chunk && typeof depBlock.chunk.id === "number") {
+	if(depBlock.chunk && !depBlock.chunk.entry && typeof depBlock.chunk.id === "number") {
 		source.replace(depBlock.expr.callee.range[0], depBlock.expr.callee.range[1]-1, "require.e/*nsure*/");
 		source.replace(depBlock.expr.arguments[0].range[0], depBlock.expr.arguments[0].range[1]-1, (depBlock.chunk.id) + "" + asComment(depBlock.chunkReason));
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ RequireEnsureDependency.Template.prototype.apply = function(dep, source, outputO`
`23`	`23`	`if(outputOptions.pathinfo) comment = "/! " + requestShortener.shorten(depBlock.chunkName) + " / ";`
`24`	`24`	`source.replace(depBlock.chunkNameRange[0], depBlock.chunkNameRange[1]-1, comment + "0");`
`25`	`25`	`}`
`26`		`- if(depBlock.chunk && typeof depBlock.chunk.id === "number") {`
	`26`	`+ if(depBlock.chunk && !depBlock.chunk.entry && typeof depBlock.chunk.id === "number") {`
`27`	`27`	`source.replace(depBlock.expr.callee.range[0], depBlock.expr.callee.range[1]-1, "require.e/nsure/");`
`28`	`28`	`source.replace(depBlock.expr.arguments[0].range[0], depBlock.expr.arguments[0].range[1]-1, (depBlock.chunk.id) + "" + asComment(depBlock.chunkReason));`
`29`	`29`	`} else {`