Produce correct code and emit better error

sokra · sokra · commit 8c8544abeabf · 2016-05-05T09:26:30.000+02:00
when trying to use unsupported AMD construct fixes webpack#2360
diff --git a/lib/dependencies/AMDPlugin.js b/lib/dependencies/AMDPlugin.js
@@ -8,6 +8,7 @@ var AMDRequireItemDependency = require("./AMDRequireItemDependency");
 var AMDRequireArrayDependency = require("./AMDRequireArrayDependency");
 var AMDRequireContextDependency = require("./AMDRequireContextDependency");
 var AMDDefineDependency = require("./AMDDefineDependency");
+var UnsupportedDependency = require("./UnsupportedDependency");
 var LocalModuleDependency = require("./LocalModuleDependency");
 var ConstDependency = require("./ConstDependency");
 
@@ -68,6 +69,9 @@ AMDPlugin.prototype.apply = function(compiler) {
 		compilation.dependencyFactories.set(AMDDefineDependency, new NullFactory());
 		compilation.dependencyTemplates.set(AMDDefineDependency, new AMDDefineDependency.Template());
 
+		compilation.dependencyFactories.set(UnsupportedDependency, new NullFactory());
+		compilation.dependencyTemplates.set(UnsupportedDependency, new UnsupportedDependency.Template());
+
 		compilation.dependencyFactories.set(LocalModuleDependency, new NullFactory());
 		compilation.dependencyTemplates.set(LocalModuleDependency, new LocalModuleDependency.Template());
 	});
diff --git a/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js b/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js
@@ -6,11 +6,13 @@ var AMDRequireItemDependency = require("./AMDRequireItemDependency");
 var AMDRequireArrayDependency = require("./AMDRequireArrayDependency");
 var AMDRequireContextDependency = require("./AMDRequireContextDependency");
 var AMDRequireDependenciesBlock = require("./AMDRequireDependenciesBlock");
+var UnsupportedDependency = require("./UnsupportedDependency");
 var LocalModuleDependency = require("./LocalModuleDependency");
 var ContextDependencyHelpers = require("./ContextDependencyHelpers");
 var LocalModulesHelpers = require("./LocalModulesHelpers");
 var ConstDependency = require("./ConstDependency");
 var getFunctionExpression = require("./getFunctionExpression");
+var UnsupportedFeatureWarning = require("../UnsupportedFeatureWarning");
 
 function AMDRequireDependenciesBlockParserPlugin(options) {
 	this.options = options;
@@ -48,7 +50,14 @@ AMDRequireDependenciesBlockParserPlugin.prototype.apply = function(parser) {
 					this.inScope([], function() {
 						result = this.applyPluginsBailResult("call require:amd:array", expr, param);
 					}.bind(this));
-					if(!result) return;
+					if(!result) {
+						dep = new UnsupportedDependency("unsupported", expr.range);
+						old.addDependency(dep);
+						if(this.state.module)
+							this.state.module.errors.push(new UnsupportedFeatureWarning(this.state.module, "Cannot statically analyse 'require(..., ...)' in line " + expr.loc.start.line));
+						dep = null;
+						return true;
+					}
 					var fnData = getFunctionExpression(expr.arguments[1]);
 					if(fnData) {
 						this.inScope(fnData.fn.params.filter(function(i) {
@@ -69,7 +78,8 @@ AMDRequireDependenciesBlockParserPlugin.prototype.apply = function(parser) {
 					}
 				} finally {
 					this.state.current = old;
-					this.state.current.addBlock(dep);
+					if(dep)
+						this.state.current.addBlock(dep);
 				}
 				return true;
 		}
diff --git a/lib/dependencies/UnsupportedDependency.js b/lib/dependencies/UnsupportedDependency.js
@@ -0,0 +1,22 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var NullDependency = require("./NullDependency");
+var DepBlockHelpers = require("./DepBlockHelpers");
+
+function UnsupportedDependency(request, range) {
+	NullDependency.call(this);
+	this.request = request;
+	this.range = range;
+}
+module.exports = UnsupportedDependency;
+
+UnsupportedDependency.prototype = Object.create(NullDependency.prototype);
+UnsupportedDependency.prototype.constructor = UnsupportedDependency;
+
+UnsupportedDependency.Template = function UnsupportedDependencyTemplate() {};
+
+UnsupportedDependency.Template.prototype.apply = function(dep, source, outputOptions, requestShortener) {
+	source.replace(dep.range[0], dep.range[1], require("./WebpackMissingModule").module(dep.request));
+};
diff --git a/test/cases/parsing/unsupported-amd/errors.js b/test/cases/parsing/unsupported-amd/errors.js
@@ -0,0 +1,4 @@
+module.exports = [
+	[/Cannot statically analyse/, /in line 12/],
+	[/Cannot statically analyse/, /in line 4/]
+];
diff --git a/test/cases/parsing/unsupported-amd/index.js b/test/cases/parsing/unsupported-amd/index.js
@@ -0,0 +1,14 @@
+it("should fail on unsupported use of AMD require 1", function() {
+	(function() {
+		var abc = ["./a", "./b"];
+		require(abc, function(a, b) {});
+	}).should.throw();
+});
+
+it("should fail on unsupported use of AMD require 2", function() {
+	(function() {
+		var abc = ["./a", "./b"];
+		function f(a, b) {}
+		require(abc, f);
+	}).should.throw();
+});
