Merge pull request #5771 from chuckdumont/work

Fail to load named modules when using ConstArray dependencies

lib/dependencies/AMDRequireArrayDependency.js

@@ -47,6 +47,8 @@ AMDRequireArrayDependency.Template = class AMDRequireArrayDependencyTemplate {
 		if(dep.module) {
 			const stringifiedId = JSON.stringify(dep.module.id);
 			return `__webpack_require__(${comment}${stringifiedId})`;
+		} else if(dep.localModule) {
+			return dep.localModule.variableName();
 		}
 
 		return webpackMissingModuleModule(dep.request);

test/cases/amd/namedModules/index.js

@@ -0,0 +1,30 @@
+define("named1", [], function() {
+	return "named1";
+});
+
+define("named2", [], function() {
+	return "named2";
+});
+
+define("named3", [], function() {
+	return "named3";
+});
+
+define("named4", [], function() {
+	return "named4";
+});
+
+define(["named1", "named2"], function(named1, named2) {
+	it("should load the named modules in defined dependencies", function() {
+		named1.should.be.eql("named1");
+		named2.should.be.eql("named2");
+	});
+
+	it("should load the named modules in require dependencies", function(done) {
+		require(["named3", "named4"], function (named3, named4) {
+			named3.should.be.eql("named3");
+			named4.should.be.eql("named4");
+			done();
+		});
+	});
+});

test/cases/amd/namedModulesConstArrayDep/index.js

@@ -0,0 +1,30 @@
+define("named1", [], function() {
+	return "named1";
+});
+
+define("named2", [], function() {
+	return "named2";
+});
+
+define("named3", [], function() {
+	return "named3";
+});
+
+define("named4", [], function() {
+	return "named4";
+});
+
+define("named1,named2".split(","), function(named1, named2) {
+	it("should load the named modules in const array defined dependencies", function() {
+		named1.should.be.eql("named1");
+		named2.should.be.eql("named2");
+	});
+
+	it("should load the named modules in const array require dependencies", function(done) {
+		require("named3,named4".split(","), function (named3, named4) {
+			named3.should.be.eql("named3");
+			named4.should.be.eql("named4");
+			done();
+		});
+	});
+});