Merge remote-tracking branch 'magento-l3/ACP2E-2045' into SEP292023_PR_pradeep

Author: pradeep1819

lib/web/mage/requirejs/mixins.js

@@ -6,11 +6,11 @@ define('mixins', [
     'module'
 ], function (module) {
     'use strict';
-
     var contexts = require.s.contexts,
         defContextName = '_',
         defContext = contexts[defContextName],
-        unbundledContext = require.s.newContext('$'),
+        unbundledContextName = '$',
+        unbundledContext = contexts[unbundledContextName] = require.s.newContext(unbundledContextName),
         defaultConfig = defContext.config,
         unbundledConfig = {
             baseUrl: defaultConfig.baseUrl,
@@ -205,7 +205,10 @@ require([
     var contexts = require.s.contexts,
         defContextName = '_',
         defContext = contexts[defContextName],
+        unbundledContextName = '$',
+        unbundledContext = contexts[unbundledContextName],
         originalContextRequire = defContext.require,
+        originalContextConfigure = defContext.configure,
         processNames = mixins.processNames;
 
     /**
@@ -219,6 +222,15 @@ require([
         return originalContextRequire(deps, callback, errback);
     };
 
+    /**
+     * Wrap original context configuration to update unbundled context,
+     * that way it is able to respect any changes done after mixins module has initialized.
+     */
+    defContext.configure = function (cfg) {
+        originalContextConfigure(cfg);
+        unbundledContext.configure(cfg);
+    };
+
     /**
      * Copy properties of original 'require' method.
      */