diff --git a/app/code/Magento/RequireJs/Block/Html/Head/Config.php b/app/code/Magento/RequireJs/Block/Html/Head/Config.php index 2d5e1c3322b948d57f6b7a27fb2d0dc9227de916..7bdba353abac229e6145745df0ea47fafbdc8fb1 100644 --- a/app/code/Magento/RequireJs/Block/Html/Head/Config.php +++ b/app/code/Magento/RequireJs/Block/Html/Head/Config.php @@ -58,15 +58,10 @@ class Config extends \Magento\Framework\View\Element\AbstractBlock */ protected function _prepareLayout() { + $after = RequireJsConfig::REQUIRE_JS_FILE_NAME; $requireJsConfig = $this->fileManager->createRequireJsConfigAsset(); $assetCollection = $this->pageConfig->getAssetCollection(); - $assetCollection->insert( - $requireJsConfig->getFilePath(), - $requireJsConfig, - RequireJsConfig::REQUIRE_JS_FILE_NAME - ); - if ($this->bundleConfig->isBundlingJsFiles()) { $bundleAssets = $this->fileManager->createBundleJsPool(); $staticAsset = $this->fileManager->createStaticJsAsset(); @@ -81,10 +76,21 @@ class Config extends \Magento\Framework\View\Element\AbstractBlock RequireJsConfig::REQUIRE_JS_FILE_NAME ); } - $assetCollection->insert($staticAsset->getFilePath(), $staticAsset, RequireJsConfig::CONFIG_FILE_NAME); + $assetCollection->insert( + $staticAsset->getFilePath(), + $staticAsset, + reset($bundleAssets)->getFilePath() + ); + $after = $staticAsset->getFilePath(); } } + $assetCollection->insert( + $requireJsConfig->getFilePath(), + $requireJsConfig, + $after + ); + return parent::_prepareLayout(); }