Fail to load named modules when using ConstArray dependencies

chuckd · chuckd · commit a2ad927ea43d · 2017-10-06T11:29:37.000-04:00
diff --git a/lib/dependencies/AMDRequireArrayDependency.js b/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);
diff --git a/test/cases/amd/namedModules/index.js b/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();
+		});
+	});
+});
diff --git a/test/cases/amd/namedModulesConstArrayDep/index.js b/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();
+		});
+	});
+});

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ AMDRequireArrayDependency.Template = class AMDRequireArrayDependencyTemplate {`
`47`	`47`	`if(dep.module) {`
`48`	`48`	`const stringifiedId = JSON.stringify(dep.module.id);`
`49`	`49`	return `__webpack_require__(${comment}${stringifiedId})`;
	`50`	`+ } else if(dep.localModule) {`
	`51`	`+ return dep.localModule.variableName();`
`50`	`52`	`}`
`51`	`53`
`52`	`54`	`return webpackMissingModuleModule(dep.request);`