Merge remote-tracking branch 'origin/MAGETWO-35026' into BUGS

Author: Maxim Medinskiy

app/code/Magento/Customer/view/frontend/templates/form/register.phtml

@@ -164,7 +164,7 @@
 require([
     'jquery',
     'mage/mage'
-], function(jQuery){
+], function($){
 
     var dataForm = $('#form-validate');
     var ignore = <?php echo $_dob->isEnabled() ? '\'input[id$="full"]\'' : 'null'; ?>;

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

@@ -6,13 +6,15 @@
 
 namespace Magento\RequireJs\Block\Html\Head;
 
+use Magento\Framework\RequireJs\Config as RequireJsConfig;
+
 /**
  * Block responsible for including RequireJs config on the page
  */
 class Config extends \Magento\Framework\View\Element\AbstractBlock
 {
     /**
-     * @var \Magento\Framework\RequireJs\Config
+     * @var RequireJsConfig
      */
     private $config;
 
@@ -28,15 +30,15 @@ class Config extends \Magento\Framework\View\Element\AbstractBlock
 
     /**
      * @param \Magento\Framework\View\Element\Context $context
-     * @param \Magento\Framework\RequireJs\Config $config
+     * @param RequireJsConfig $config
      * @param \Magento\RequireJs\Model\FileManager $fileManager
      * @param \Magento\Framework\View\Page\Config $pageConfig
      * @param \Magento\Framework\View\Asset\ConfigInterface $bundleConfig
      * @param array $data
      */
     public function __construct(
         \Magento\Framework\View\Element\Context $context,
-        \Magento\Framework\RequireJs\Config $config,
+        RequireJsConfig $config,
         \Magento\RequireJs\Model\FileManager $fileManager,
         \Magento\Framework\View\Page\Config $pageConfig,
         \Magento\Framework\View\Asset\ConfigInterface $bundleConfig,
@@ -59,28 +61,30 @@ protected function _prepareLayout()
         $requireJsConfig = $this->fileManager->createRequireJsConfigAsset();
         $assetCollection = $this->pageConfig->getAssetCollection();
 
-        if ($this->bundleConfig->isBundlingJsFiles()) {
-            $after = \Magento\Framework\RequireJs\Config::REQUIRE_JS_FILE_NAME;
+        $assetCollection->insert(
+            $requireJsConfig->getFilePath(),
+            $requireJsConfig,
+            RequireJsConfig::REQUIRE_JS_FILE_NAME
+        );
 
+        if ($this->bundleConfig->isBundlingJsFiles()) {
             $bundleAssets = $this->fileManager->createBundleJsPool();
             $staticAsset = $this->fileManager->createStaticJsAsset();
 
             /** @var \Magento\Framework\View\Asset\File $bundleAsset */
             if (!empty($bundleAssets) && $staticAsset !== false) {
+                $bundleAssets = array_reverse($bundleAssets);
                 foreach ($bundleAssets as $bundleAsset) {
-                    $assetCollection->insert($bundleAsset->getFilePath(), $bundleAsset, $after);
-                    $after = $bundleAsset->getFilePath();
+                    $assetCollection->insert(
+                        $bundleAsset->getFilePath(),
+                        $bundleAsset,
+                        RequireJsConfig::REQUIRE_JS_FILE_NAME
+                    );
                 }
-                $assetCollection->insert($staticAsset->getFilePath(), $staticAsset, $after);
+                $assetCollection->insert($staticAsset->getFilePath(), $staticAsset, RequireJsConfig::CONFIG_FILE_NAME);
             }
         }
 
-        $assetCollection->insert(
-            $requireJsConfig->getFilePath(),
-            $requireJsConfig,
-            \Magento\Framework\RequireJs\Config::REQUIRE_JS_FILE_NAME
-        );
-
         return parent::_prepareLayout();
     }