bug fix for replacements webpack#167

sokra · sokra · commit 4dd7368e743f · 2014-02-13T11:03:01.000+01:00
diff --git a/lib/dependencies/AMDRequireDependency.js b/lib/dependencies/AMDRequireDependency.js
@@ -48,9 +48,11 @@ AMDRequireDependency.Template.prototype.apply = function(dep, source, outputOpti
 			source.replace(depBlock.functionRange[1], depBlock.outerRange[1]-1, "})");
 		} else {
 			source.replace(depBlock.outerRange[0], depBlock.arrayRange[0]-1,
-				"!/* require */(" + asComment(depBlock.chunkReason) + "function() { var __WEBPACK_AMD_REQUIRE_ARRAY__ = ");
+				"!/* require */(" + asComment(depBlock.chunkReason) + "function() { ");
+			source.insert(depBlock.arrayRange[0] + 0.9, "var __WEBPACK_AMD_REQUIRE_ARRAY__ = ");
 			source.replace(depBlock.arrayRange[1], depBlock.functionRange[0]-1, "; (");
-			source.replace(depBlock.functionRange[1], depBlock.outerRange[1]-1, ".apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__));}())");
+			source.insert(depBlock.functionRange[1], ".apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__));");
+			source.replace(depBlock.functionRange[1], depBlock.outerRange[1]-1, "}())");
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -48,9 +48,11 @@ AMDRequireDependency.Template.prototype.apply = function(dep, source, outputOpti`
`48`	`48`	`source.replace(depBlock.functionRange[1], depBlock.outerRange[1]-1, "})");`
`49`	`49`	`} else {`
`50`	`50`	`source.replace(depBlock.outerRange[0], depBlock.arrayRange[0]-1,`
`51`		`- "!/* require */(" + asComment(depBlock.chunkReason) + "function() { var __WEBPACK_AMD_REQUIRE_ARRAY__ = ");`
	`51`	`+ "!/* require */(" + asComment(depBlock.chunkReason) + "function() { ");`
	`52`	`+ source.insert(depBlock.arrayRange[0] + 0.9, "var __WEBPACK_AMD_REQUIRE_ARRAY__ = ");`
`52`	`53`	`source.replace(depBlock.arrayRange[1], depBlock.functionRange[0]-1, "; (");`
`53`		`- source.replace(depBlock.functionRange[1], depBlock.outerRange[1]-1, ".apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__));}())");`
	`54`	`+ source.insert(depBlock.functionRange[1], ".apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__));");`
	`55`	`+ source.replace(depBlock.functionRange[1], depBlock.outerRange[1]-1, "}())");`
`54`	`56`	`}`
`55`	`57`	`}`
`56`	`58`	`}`