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

@@ -1445,25 +1445,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;
  }