Merge pull request #340 from chuckdumont/work

Fix djProp name collision detection for HRM. This resolves #339
OpenNTF · Jun 16, 2021 · 181f5d2 · 181f5d2
2 parents e0126dc + 0d94846
commit 181f5d2
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/DojoAMDRuntimeModule.js b/lib/DojoAMDRuntimeModule.js
@@ -23,8 +23,10 @@ class DojoAMDRuntimeModule extends RuntimeModule {
 	 */
 	generate() {
 		const pluginProps = getPluginProps(this.compilation.compiler);
+		const djProp = `__webpack_require__.${this.options.requireFnPropName}`;
 		const [runtimeSource, asyncSource] = ['main', 'async'].map(type => Template.getFunctionContent(runtime[type])
-		                           .replace(/__async__/g, (!!this.options.async).toString()));
+		                           .replace(/__async__/g, (!!this.options.async).toString())
+		                           .replace('__webpack_require__.dj', djProp));
 		const chunkLoadingGlobal = JSON.stringify(this.compilation.outputOptions.chunkLoadingGlobal);
 		const buf = [];
 
@@ -45,10 +47,10 @@ class DojoAMDRuntimeModule extends RuntimeModule {
 		}
 		buf.push("");
 		buf.push("// expose the Dojo compatibility functions as a properties of __webpack_require__");
-		const djProp = `__webpack_require__.${this.options.requireFnPropName}`;
-		buf.push(`if (${djProp}) throw new Error("${djProp} name collision.")`);
+		buf.push(`if (${djProp} && ${djProp}.name !== '${pluginName}') throw new Error("${djProp} name collision.")`);
 		buf.push(`${djProp} = {`);
 		buf.push(Template.indent([
+			`name: '${pluginName}',`,
 			"r: req,",
 			"c: createContextRequire,",
 			"m: dojoModuleFromWebpackModule,",