Merge pull request #304 from toddbc/min-js

Add min resolver to render after requirejs

Author: davemacaulay

app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php

@@ -8,6 +8,8 @@
 
 namespace Magento\PageBuilder\Block\Adminhtml\Stage;
 
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Asset\Minification;
 use Magento\Framework\View\Element\Template;
 use Magento\RequireJs\Model\FileManager;
 use Magento\PageBuilder\Model\Stage\Config;
@@ -33,24 +35,32 @@ class Render extends Template
      */
     private $json;
 
+    /**
+     * @var Minification
+     */
+    private $minification;
+
     /**
      * @param Template\Context $context
      * @param FileManager $fileManager
      * @param Config $config
      * @param Json $json
      * @param array $data
+     * @param Minification $minification
      */
     public function __construct(
         Template\Context $context,
         FileManager $fileManager,
         Config $config,
         Json $json,
-        array $data = []
+        array $data = [],
+        Minification $minification = null
     ) {
         parent::__construct($context, $data);
         $this->fileManager = $fileManager;
         $this->pageBuilderConfig = $config;
         $this->json = $json;
+        $this->minification = $minification ?: ObjectManager::getInstance()->get(Minification::class);
     }
 
     /**
@@ -65,6 +75,20 @@ public function getRequireJsUrl() : string
         return $asset->getUrl();
     }
 
+    /**
+     * Generate the URL to the RequireJS min resolver, if minification enabled.
+     *
+     * @return string|null
+     */
+    public function getRequireJsMinUrl() : ?string
+    {
+        if ($this->minification->isEnabled('js')) {
+            $minResolverAsset = $this->fileManager->createMinResolverAsset();
+            return $minResolverAsset->getUrl();
+        }
+        return null;
+    }
+
     /**
      * Retrieve the URL to the RequireJS Config file
      *

app/code/Magento/PageBuilder/view/adminhtml/templates/stage/render.phtml

@@ -7,6 +7,9 @@
 /** @var \Magento\PageBuilder\Block\Adminhtml\Stage\Render $block */
 ?>
 <script src="<?= $block->escapeUrl($block->getRequireJsUrl()); ?>"></script>
+<?php if ($block->getRequireJsMinUrl()) : ?>
+<script src="<?= $block->escapeUrl($block->getRequireJsMinUrl()); ?>"></script>
+<?php endif; ?>
 <script src="<?= $block->escapeUrl($block->getRequireJsConfigUrl()); ?>"></script>
 <script>
     <?php