Always use mixins! as a prefix.

This is safe and it's needed for anything that uses mixins.

Author: toddbc

RequireJsLoaderPlugin.js

@@ -9,11 +9,10 @@ function gatherRequireJsImports(modules) {
     let needsImport = [];
     for (let module of modules) {
         // If the requirejs-loader was used, then we need to wrap and import this module.
+        // It's safe to use mixins! in all cases, and necessary for anything where require('mixins').hasMixins(module) is true.
         // TODO: Clean up this check.
-        if (module.request && String(module.request).indexOf('jquery.js') !== -1) {
+        if (module.request && module.request.indexOf('requirejs-loader') !== -1) {
             needsImport.push('mixins!' + module.rawRequest);
-        } else if (module.request && module.request.indexOf('requirejs-loader') !== -1) {
-            needsImport.push(module.rawRequest);
         }
     }
 

index.js

@@ -10,9 +10,9 @@ module.exports.pitch = function (remainingRequest) {
 	this.cacheable && this.cacheable();
 
     // Route through window.require.
+    // It's safe to use mixins! in all cases, and necessary for anything where require('mixins').hasMixins(module) is true.
     // TODO: We use rawRequest to grab the original request (including text! or etc.)
-    const prefix = (this._module.rawRequest == 'jquery') ? 'mixins!' : '';
-    const jsonName = JSON.stringify(prefix + this._module.rawRequest);
+    const jsonName = JSON.stringify('mixins!' + this._module.rawRequest);
     return `module.exports = window.require(${jsonName});`;
 };