Reprocess PR 39097 fixes requireJS mixins racecondition with require calls in dom

app/code/Magento/RequireJs/Block/Html/Head/Config.php

@@ -123,18 +123,18 @@ protected function _prepareLayout()
                 $after = $staticAsset->getFilePath();
             }
         }
-        $requireJsConfig = $this->fileManager->createRequireJsConfigAsset();
-        $assetCollection->insert(
-            $requireJsConfig->getFilePath(),
-            $requireJsConfig,
-            $after
-        );
         $requireJsMixinsConfig = $this->fileManager->createRequireJsMixinsAsset();
         $assetCollection->insert(
             $requireJsMixinsConfig->getFilePath(),
             $requireJsMixinsConfig,
             $after
         );
+        $requireJsConfig = $this->fileManager->createRequireJsConfigAsset();
+        $assetCollection->insert(
+            $requireJsConfig->getFilePath(),
+            $requireJsConfig,
+            $after
+        );
         return parent::_prepareLayout();
     }
 }

app/code/Magento/Theme/view/base/requirejs-config.js

@@ -83,9 +83,3 @@ var config = {
         }
     }
 };
-
-require(['jquery'], function ($) {
-    'use strict';
-
-    $.noConflict();
-});

lib/web/mage/requirejs/mixins.js

@@ -253,4 +253,11 @@ require([
 
         return queueItem;
     };
+
+    require(['jquery'], function ($) {
+        'use strict';
+
+        $.noConflict();
+    });
+
 });

lib/web/requirejs/require.js

@@ -1288,7 +1288,6 @@ var requirejs, require, define;
             defQueueMap: {},
             Module: Module,
             makeModuleMap: makeModuleMap,
-            nextTick: req.nextTick,
             onError: onError,
 
             /**
@@ -1463,25 +1462,18 @@ var requirejs, require, define;
                     //Grab defines waiting in the global queue.
                     intakeDefines();
 
-                    //Mark all the dependencies as needing to be loaded.
-                    context.nextTick(function () {
-                        //Some defines could have been added since the
-                        //require call, collect them.
-                        intakeDefines();
+                    requireMod = getModule(makeModuleMap(null, relMap));
 
-                        requireMod = getModule(makeModuleMap(null, relMap));
+                    //Store if map config should be applied to this require
+                    //call for dependencies.
+                    requireMod.skipMap = options.skipMap;
 
-                        //Store if map config should be applied to this require
-                        //call for dependencies.
-                        requireMod.skipMap = options.skipMap;
-
-                        requireMod.init(deps, callback, errback, {
-                            enabled: true
-                        });
-
-                        checkLoaded();
+                    requireMod.init(deps, callback, errback, {
+                        enabled: true
                     });
 
+                    checkLoaded();
+
                     return localRequire;
                 }
 
@@ -1832,16 +1824,6 @@ var requirejs, require, define;
         return req(config);
     };
 
-    /**
-     * Execute something after the current tick
-     * of the event loop. Override for other envs
-     * that have a better solution than setTimeout.
-     * @param  {Function} fn function to execute later.
-     */
-    req.nextTick = typeof setTimeout !== 'undefined' ? function (fn) {
-        setTimeout(fn, 4);
-    } : function (fn) { fn(); };
-
     /**
      * Export require as a global, but only if it does not already exist.
      */