MAGETWO-33622: Junior+ Developer Workflow

Author: Pavlo Cherniavskyi

app/etc/di.xml

@@ -181,9 +181,14 @@
             <argument name="mode" xsi:type="init_parameter">Magento\Framework\App\State::PARAM_MODE</argument>
         </arguments>
     </type>
-    <type name="\Magento\Framework\View\Asset\Source">
+    <type name="Magento\Framework\View\Asset\Source">
         <arguments>
-            <argument name="appmode" xsi:type="init_parameter">Magento\Framework\App\State::PARAM_MODE</argument>
+            <argument name="appMode" xsi:type="init_parameter">Magento\Framework\App\State::PARAM_MODE</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Framework\View\Page\Config\Renderer">
+        <arguments>
+            <argument name="appMode" xsi:type="init_parameter">Magento\Framework\App\State::PARAM_MODE</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\App\Arguments\ValidationState">

lib/internal/Magento/Framework/View/Asset/File.php

@@ -101,7 +101,7 @@ public function getPath()
     public function getRelativeSourceFilePath()
     {
         $path = $this->filePath;
-        if  (strpos($this->source->findRelativeSourceFile($this), 'less'))  {
+        if  (strpos($this->source->findRelativeSourceFilePath($this), 'less'))  {
             $path = str_replace('.css', '.less', $this->filePath);
         }
         $result = '';
@@ -130,9 +130,7 @@ private function join($path, $item)
     public function getSourceFile()
     {
         if (null === $this->resolvedFile) {
-            $result = $this->source->getFile($this);
-            $this->resolvedFile = $result['abs'];
-            $this->filePath = $result['relativePath'];
+            $this->resolvedFile = $this->source->getFile($this);
             if (false === $this->resolvedFile) {
                 throw new File\NotFoundException("Unable to resolve the source file for '{$this->getPath()}'");
             }

lib/internal/Magento/Framework/View/Asset/Source.php

@@ -94,10 +94,7 @@ public function getFile(LocalInterface $asset)
             return false;
         }
         list($dirCode, $path) = $result;
-        return [
-            'abs' => $this->filesystem->getDirectoryRead($dirCode)->getAbsolutePath($path),
-            'relativePath' => $path
-        ];
+        return $this->filesystem->getDirectoryRead($dirCode)->getAbsolutePath($path);
     }
 
     /**
@@ -146,7 +143,7 @@ private function preProcess(LocalInterface $asset)
             $this->rootDir->readFile($path),
             $this->getContentType($path),
             $path,
-            'developer'
+            $this->appMode
         );
         $preProcessors = $this->preProcessorPool
             ->getPreProcessors($chain->getOrigContentType(), $chain->getTargetContentType());
@@ -232,7 +229,7 @@ private function findFile(LocalInterface $asset, \Magento\Framework\View\Asset\F
         return $dir->getAbsolutePath($asset->getPath());
     }
 
-    public function findRelativeSourceFile(LocalInterface $asset)
+    public function findRelativeSourceFilePath(LocalInterface $asset)
     {
         $sourceFile = $this->findSourceFile($asset);
         if (!$sourceFile) {

lib/internal/Magento/Framework/View/Page/Config/Renderer.php

@@ -54,6 +54,16 @@ class Renderer
      */
     protected $urlBuilder;
 
+    /**
+     * @var string
+     */
+    private $appMode;
+
+    /**
+     * @var \Magento\Framework\View\Asset\Repository
+     */
+    private $assetRepo;
+
     /**
      * @param \Magento\Framework\View\Page\Config $pageConfig
      * @param \Magento\Framework\View\Asset\MinifyService $assetMinifyService
@@ -70,7 +80,9 @@ public function __construct(
         \Magento\Framework\UrlInterface $urlBuilder,
         \Magento\Framework\Escaper $escaper,
         \Magento\Framework\Stdlib\String $string,
-        \Psr\Log\LoggerInterface $logger
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Framework\View\Asset\Repository $assetRepo,
+        $appMode = \Magento\Framework\App\State::MODE_DEFAULT
     ) {
         $this->pageConfig = $pageConfig;
         $this->assetMinifyService = $assetMinifyService;
@@ -79,6 +91,8 @@ public function __construct(
         $this->escaper = $escaper;
         $this->string = $string;
         $this->logger = $logger;
+        $this->assetRepo = $assetRepo;
+        $this->appMode = $appMode;
     }
 
     /**
@@ -219,12 +233,11 @@ public function prepareFavicon()
     public function renderAssets()
     {
         $resultGroups = array_fill_keys($this->assetTypeOrder, '');
+        // less js have to be injected before any *.js in developer mode
+        $resultGroups = $this->renderLessJsScripts($resultGroups);
         /** @var $group \Magento\Framework\View\Asset\PropertyGroup */
         foreach ($this->pageConfig->getAssetCollection()->getGroups() as $group) {
             $type = $group->getProperty(GroupedCollection::PROPERTY_CONTENT_TYPE);
-            if ($type == 'js') {
-                $resultGroups[$type] .= $this->renderLessJsInclude();
-            }
             if (!isset($resultGroups[$type])) {
                 $resultGroups[$type] = '';
             }
@@ -365,18 +378,16 @@ protected function renderAssetHtml($template, $assets)
     {
         $result = '';
         try {
-            /** @var $asset \Magento\Framework\View\Asset\File */
             foreach ($assets as $asset) {
-
-                if (true) {
+                /** @var $asset \Magento\Framework\View\Asset\File */
+                if ($this->appMode == \Magento\Framework\App\State::MODE_DEVELOPER) {
                     if ($asset->getSourceUrl() != $asset->getUrl()) {
                         $attributes = $this->addDefaultAttributes('less', []);
                         $groupTemplate = $this->getAssetTemplate('less', $attributes);
                         $result .= sprintf($groupTemplate, $asset->getSourceUrl());
                     } else {
-                        $result .= sprintf($template, $asset->getSourceUrl());
+                        $result .= sprintf($template, $asset->getUrl());
                     }
-
                 } else {
                     $result .= sprintf($template, $asset->getUrl());
                 }
@@ -388,17 +399,23 @@ protected function renderAssetHtml($template, $assets)
         return $result;
     }
 
-    private function renderLessJsInclude()
+    /**
+     * Injecting less.js compiler
+     *
+     * @param $resultGroups
+     *
+     * @return mixed
+     */
+    private function renderLessJsScripts($resultGroups)
     {
-        $result = '';
-        $result .= '<script>
-      less = {
-        env: "production",
-        async: false,
-        fileAsync: false
-      };
-    </script>' ;
-        $result .= sprintf('<script src="%s"></script>' . "\n", '//cdnjs.cloudflare.com/ajax/libs/less.js/2.3.1/less.min.js') ;
-        return $result;
+        if (\Magento\Framework\App\State::MODE_DEVELOPER == $this->appMode) {
+            // less js have to be injected before any *.js in developer mode
+            $lessJsConfigAsset = $this->assetRepo->createAsset('less/config.less.js');
+            $resultGroups['js'] .= sprintf('<script src="%s"></script>' . "\n", $lessJsConfigAsset->getUrl()) ;
+            $lessJsAsset = $this->assetRepo->createAsset('less/less.min.js');
+            $resultGroups['js'] .= sprintf('<script src="%s"></script>' . "\n", $lessJsAsset->getUrl()) ;
+        }
+
+        return $resultGroups;
     }
 }

lib/web/less/config.less.js

@@ -1,7 +1,4 @@
 
-
 less = {
-    env: "developer",
-    async: false,
-    fileAsync: false
+    env: "development"
 };