ACP2E-4058: Not minified JS sometimes loads ignoring 'enable js minifications'

Author: aplapana

app/code/Magento/Deploy/Service/DeployRequireJsConfig.php

@@ -110,7 +110,7 @@ public function deploy($areaCode, $themePath, $localeCode)
             ]
         );
 
-        $fileManager->createRequireJsConfigAsset();//see here
+        $fileManager->createRequireJsConfigAsset();
 
         $fileManager->createMinResolverAsset();
 

app/code/Magento/Theme/view/frontend/requirejs-config-minify.js

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright 2014 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 namespace Magento\Framework\RequireJs;
 
@@ -20,32 +20,27 @@ class Config
      *
      * @deprecated since 2.2.0 RequireJS Configuration file is moved into package directory
      */
-    public const DIR_NAME = '_requirejs';
+    const DIR_NAME = '_requirejs';
 
     /**
      * File name of RequireJs config
      */
-    public const CONFIG_FILE_NAME = 'requirejs-config.js';
-
-    /**
-     * File name of minified RequireJs config
-     */
-    public const CONFIG_FILE_NAME_MIN = 'requirejs-config-minify.js';
+    const CONFIG_FILE_NAME = 'requirejs-config.js';
 
     /**
      * File name of RequireJs mixins
      */
-    public const MIXINS_FILE_NAME = 'mage/requirejs/mixins.js';
+    const MIXINS_FILE_NAME = 'mage/requirejs/mixins.js';
 
     /**
      * File name of RequireJs
      */
-    public const REQUIRE_JS_FILE_NAME = 'requirejs/require.js';
+    const REQUIRE_JS_FILE_NAME = 'requirejs/require.js';
 
     /**
      * File name of StaticJs
      */
-    public const STATIC_FILE_NAME = 'mage/requirejs/static.js';
+    const STATIC_FILE_NAME = 'mage/requirejs/static.js';
 
     /**
      * File name of minified files resolver

lib/internal/Magento/Framework/RequireJs/Config.php

@@ -1,18 +1,14 @@
 <?php
 /**
- * Copyright 2014 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Framework\RequireJs\Config\File\Collector;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Filesystem;
-use Magento\Framework\RequireJs\Config as RequireJsConfig;
-use Magento\Framework\View\Asset\Minification;
 use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Framework\View\File\CollectorInterface;
-use Magento\Framework\View\File\Factory;
 
 /**
  * Source of RequireJs config files basing on list of directories they may be located in
@@ -46,37 +42,29 @@ class Aggregated implements CollectorInterface
     protected $libDirectory;
 
     /**
-     * @var Factory
+     * @var \Magento\Framework\View\File\Factory
      */
     protected $fileFactory;
 
     /**
-     * @var Minification
-     */
-    private Minification $minification;
-
-    /**
-     * @param Filesystem $filesystem
-     * @param Factory $fileFactory
+     * @param \Magento\Framework\Filesystem $filesystem
+     * @param \Magento\Framework\View\File\Factory $fileFactory
      * @param CollectorInterface $baseFiles
      * @param CollectorInterface $themeFiles
      * @param CollectorInterface $themeModularFiles
-     * @param Minification $minification
      */
     public function __construct(
-        Filesystem         $filesystem,
-        Factory            $fileFactory,
+        \Magento\Framework\Filesystem $filesystem,
+        \Magento\Framework\View\File\Factory $fileFactory,
         CollectorInterface $baseFiles,
         CollectorInterface $themeFiles,
-        CollectorInterface $themeModularFiles,
-        Minification       $minification
+        CollectorInterface $themeModularFiles
     ) {
         $this->libDirectory = $filesystem->getDirectoryRead(DirectoryList::LIB_WEB);
         $this->fileFactory = $fileFactory;
         $this->baseFiles = $baseFiles;
         $this->themeFiles = $themeFiles;
         $this->themeModularFiles = $themeModularFiles;
-        $this->minification = $minification;
     }
 
     /**
@@ -104,47 +92,6 @@ public function getFiles(ThemeInterface $theme, $filePath)
             $files = array_merge($files, $this->themeModularFiles->getFiles($currentTheme, $filePath));
             $files = array_merge($files, $this->themeFiles->getFiles($currentTheme, $filePath));
         }
-        //return $files;
-        return $this->adjustMinification($theme, $files, $filePath);
-    }
-
-    /**
-     * @param ThemeInterface $theme
-     * @param array $files
-     * @param string $filePath
-     * @return array
-     */
-    private function adjustMinification(ThemeInterface $theme, array $files, string $filePath): array
-    {
-        if ($this->minification->isEnabled('js') && $filePath === RequireJsConfig::CONFIG_FILE_NAME) {
-            $minifiedConfigurations = $this->baseFiles->getFiles($theme, RequireJsConfig::CONFIG_FILE_NAME_MIN);
-            foreach ($theme->getInheritedThemes() as $currentTheme) {
-                $minifiedConfigurations = array_merge(
-                    $minifiedConfigurations,
-                    $this->themeModularFiles->getFiles($currentTheme, RequireJsConfig::CONFIG_FILE_NAME_MIN)
-                );
-                $minifiedConfigurations = array_merge(
-                    $minifiedConfigurations,
-                    $this->themeFiles->getFiles($currentTheme, RequireJsConfig::CONFIG_FILE_NAME_MIN)
-                );
-            }
-            if (!empty($minifiedConfigurations)) {
-                /* @var \Magento\Framework\View\File $file */
-                foreach ($files as $key => $file) {
-                    foreach ($minifiedConfigurations as $minifiedConfiguration) {
-                        $replacedFilename = str_replace(
-                            RequireJsConfig::CONFIG_FILE_NAME_MIN,
-                            RequireJsConfig::CONFIG_FILE_NAME,
-                            $minifiedConfiguration->getFilename()
-                        );
-                        if ($file->getFilename() === $replacedFilename) {
-                            $files[$key] = $minifiedConfiguration;
-                        }
-                    }
-                }
-            }
-        }
-
         return $files;
     }
 }

lib/internal/Magento/Framework/RequireJs/Config/File/Collector/Aggregated.php

@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 define('mixins', [
     'module'
@@ -17,8 +17,7 @@ define('mixins', [
             paths: defaultConfig.paths,
             shim: defaultConfig.shim,
             config: defaultConfig.config,
-            map: defaultConfig.map,
-            nameToUrl: defaultConfig.nameToUrl,
+            map: defaultConfig.map
         },
         rjsMixins;