Support DLLPlugin

Author: Chuck Dumont

lib/DojoAMDModuleFactoryPlugin.js

@@ -19,6 +19,7 @@ const {newNormalModule} = require("./compat");
 const DojoAMDRequireItemDependency = require("./DojoAMDRequireItemDependency");
 const {reg, tap, callSync, callSyncBail} = require("./pluginCompat").for("dojo-webpack-plugin");
 const SingleEntryDependency = require("webpack/lib/dependencies/SingleEntryDependency");
+const Module = require("webpack/lib/Module");
 
 module.exports = class DojoAMDModuleFactoryPlugin {
 	constructor(options) {
@@ -210,13 +211,20 @@ module.exports = class DojoAMDModuleFactoryPlugin {
 	}
 
 	module(module) {
+		if (module.originalRequest instanceof Module) {
+			// Copy absMids from original request to the new request
+			callSync(this.factory, "filter absMids", module.originalRequest, absMid => {
+				callSync(this.factory, "add absMid", module, absMid);
+				return true;
+			});
+		}
 		// If the module already exists in the compilation, then copy the absMid data from
 		// this module to the existing module since this module will be discarded
 		const existing = this.compilation.findModule(module.request);
-		if (existing && module.absMid) {
-			callSync(this.factory, "add absMid", existing, module.absMid);
-			(module.absMidAliases||[]).forEach(absMid => {
+		if (existing) {
+			callSync(this.factory, "filter absMids", module, absMid => {
 				callSync(this.factory, "add absMid", existing, absMid);
+				return true;
 			});
 		}
 		// Add functions to the module object for adding/filtering absMids (for use by loaders)

test/DojoAMDModuleFactoryPlugin.test.js

@@ -8,6 +8,7 @@
  */
 const DojoAMDModuleFactoryPlugin = require("../lib/DojoAMDModuleFactoryPlugin");
 const {Tapable, reg, callSync, callSyncWaterfall} = require("../lib/pluginCompat");
+const Module = require("webpack/lib/Module");
 const plugin = new DojoAMDModuleFactoryPlugin({});
 
 class Factory extends Tapable {
@@ -203,6 +204,19 @@ describe("DojoAMDModuleFactoryPlugin tests", function() {
 			existing.absMid.should.eql('a');
 			existing.absMidAliases.length.should.eql(0);
 		});
+
+		it("Should copy absMids from original request of delgated modules", function() {
+			const originalModule = new Module("test");
+			const delegated = {originalRequest: originalModule};
+			callSync(factory, "add absMid", originalModule, "a");
+			compilation.findModule = function() { return null; };
+			debugger; // eslint-disable-line
+			const result = callSyncWaterfall(factory, "module", delegated);
+			result.should.be.eql(delegated);
+			result.absMid.should.eql('a');
+			result.absMidAliases.length.should.eql(0);
+			originalModule.absMid.should.eql('a');
+		});
 	});
 
 	describe("toAbsMid tests", function() {