fixed webpack#2600

sokra · sokra · commit 706c76c37907 · 2016-07-20T15:42:52.000+02:00
diff --git a/lib/dependencies/SystemImportDependency.js b/lib/dependencies/SystemImportDependency.js
@@ -23,7 +23,7 @@ SystemImportDependency.Template.prototype.apply = function(dep, source, outputOp
 	var promise = DepBlockHelpers.getDepBlockPromise(depBlock, outputOptions, requestShortener, "System.import");
 	var comment = "";
 	if(outputOptions.pathinfo) comment = "/*! " + requestShortener.shorten(dep.request) + " */ ";
-	if(promise) {
+	if(promise && dep.module) {
 		source.replace(depBlock.range[0], depBlock.range[1] - 1, promise + ".then(__webpack_require__.bind(null, " + comment + JSON.stringify(dep.module.id) + "))");
 	} else if(dep.module) {
 		source.replace(depBlock.range[0], depBlock.range[1] - 1, "Promise.resolve(__webpack_require__(" + comment + JSON.stringify(dep.module.id) + "))");
diff --git a/lib/dependencies/WebpackMissingModule.js b/lib/dependencies/WebpackMissingModule.js
@@ -9,7 +9,7 @@ exports.module = function(request) {
 };
 
 exports.promise = function(request) {
-	return "Promise.reject((function webpackMissingModule() { " +
+	return "Promise.reject(function webpackMissingModule() { " +
 		"var e = new Error(" + JSON.stringify("Cannot find module \"" + request + "\"") + "); " +
 		"e.code = 'MODULE_NOT_FOUND'; " +
 		"return e; " +
diff --git a/test/cases/parsing/issue-2600/errors.js b/test/cases/parsing/issue-2600/errors.js
@@ -0,0 +1,3 @@
+module.exports = [
+	[/Can't resolve 'missing'/]
+];
diff --git a/test/cases/parsing/issue-2600/index.js b/test/cases/parsing/issue-2600/index.js
@@ -0,0 +1,4 @@
+if(Math.sin(1) > 1000)
+	System.import("missing");
+
+it("should run", function() {});

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = [`
	`2`	`+ [/Can't resolve 'missing'/]`
	`3`	`+];`