Merge pull request #343 from chuckdumont/work

Fix issues with dojo/has module not found
OpenNTF · Aug 3, 2021 · d5672e1 · d5672e1
2 parents d39b80e + d14c99a
commit d5672e1
Showing 1 changed file with 8 additions and 12 deletions.
diff --git a/lib/DojoAMDRuntimeModule.js b/lib/DojoAMDRuntimeModule.js
@@ -40,11 +40,9 @@ class DojoAMDRuntimeModule extends RuntimeModule {
 		buf.push("});");
 		buf.push("");
 		buf.push(pluginProps.hooks.dojoGlobalRequire.call("globalObj.require = req;"));
-		if(this.chunk.hasAsyncChunks()) {
-			buf.push(Template.indent(
-				`(self[${chunkLoadingGlobal}] = self[${chunkLoadingGlobal}] || []).registerAbsMids = registerAbsMids;`
-			));
-		}
+		buf.push(Template.indent(
+			`(self[${chunkLoadingGlobal}] = self[${chunkLoadingGlobal}] || []).registerAbsMids = registerAbsMids;`
+		));
 		buf.push("");
 		buf.push("// expose the Dojo compatibility functions as a properties of __webpack_require__");
 		buf.push(`if (${djProp} && ${djProp}.name !== '${pluginName}') throw new Error("${djProp} name collision.")`);
@@ -104,13 +102,11 @@ but the loader specified at ${pluginProps.embeddedLoaderFilename} was built with
 		if (loaderConfig.has && loaderConfig.has['dojo-undef-api']) {
 			buf.push("req.undef = " +  Template.getFunctionContent(runtime.undef));
 		}
-		if(this.chunk.hasAsyncChunks()) {
-			buf.push(`var absMidsWaiting = globalObj[${chunkLoadingGlobal}].absMidsWaiting;`);
-			buf.push("if (absMidsWaiting) {");
-			buf.push("   absMidsWaiting.forEach(registerAbsMids);");
-			buf.push(`   delete globalObj[${chunkLoadingGlobal}].absMidsWaiting;`);
-			buf.push("}");
-		}
+		buf.push(`var absMidsWaiting = globalObj[${chunkLoadingGlobal}].absMidsWaiting;`);
+		buf.push("if (absMidsWaiting) {");
+		buf.push("   absMidsWaiting.forEach(registerAbsMids);");
+		buf.push(`   delete globalObj[${chunkLoadingGlobal}].absMidsWaiting;`);
+		buf.push("}");
 		return Template.asString([
 			`(function() { /* Start ${pluginName} extensions */`,
 			Template.indent(buf),