Merge pull request #288 from chuckdumont/work

Handle case where another AMD loader (e.g. requirejs) is already loaded.
OpenNTF · Jun 18, 2020 · 5e8922e · 5e8922e
2 parents 980a30d + c1ba099
commit 5e8922e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/lib/DojoAMDMainTemplatePlugin.js b/lib/DojoAMDMainTemplatePlugin.js
@@ -133,6 +133,9 @@ module.exports = class DojoAMDMainTemplatePlugin {
 		buf.push("   window:{value:loaderScope},");
 		buf.push("   global:{value:loaderScope}");
 		buf.push("});");
+		// Remove evidence of any existing AMD loader or else the Dojo loader won't initialize properly.
+		buf.push("loaderScope.define = loaderScope.require = undefined");
+
 		const dojoLoaderModule = this.compilation.modules.find((module) => { return module.rawRequest === this.embeddedLoaderFilename;});
 		if (!dojoLoaderModule) {
 			throw Error("Can't locate " + this.embeddedLoaderFilename + " in compilation");

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dojo-webpack-plugin",
-  "version": "2.8.14",
+  "version": "2.8.15-rc1",
   "author": "Chuck Dumont",
   "description": "Supports using webpack with Dojo 1.x applications",
   "scripts": {