diff --git a/lib/DojoAMDMainTemplatePlugin.js b/lib/DojoAMDMainTemplatePlugin.js index c0f134a..2ac4769 100644 --- 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 index d7365fd..40a87ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "dojo-webpack-plugin", - "version": "2.8.14-rc1", + "version": "2.8.15-rc1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -730,7 +730,7 @@ }, "browserify-aes": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { @@ -775,7 +775,7 @@ }, "browserify-rsa": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", "dev": true, "requires": { @@ -1334,7 +1334,7 @@ }, "create-hash": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { @@ -1347,7 +1347,7 @@ }, "create-hmac": { "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", "dev": true, "requires": { @@ -1524,7 +1524,7 @@ }, "diffie-hellman": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", "dev": true, "requires": { @@ -4946,7 +4946,7 @@ }, "sha.js": { "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { diff --git a/package.json b/package.json index b6bf8bc..e2d6b03 100644 --- 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": {