ENGCOM-6382: Prevent RequireJS from adding .min.js suffix to external files #25869

Author: VladimirZaets

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

@@ -196,11 +196,14 @@ public function getConfigFileRelativePath()
      */
     public function getMixinsFileRelativePath()
     {
-        $map = $this->getRepositoryFilesMap(Config::MIXINS_FILE_NAME, [
-            'area' => $this->staticContext->getAreaCode(),
-            'theme' => $this->staticContext->getThemePath(),
-            'locale' => $this->staticContext->getLocale(),
-        ]);
+        $map = $this->getRepositoryFilesMap(
+            Config::MIXINS_FILE_NAME,
+            [
+                'area' => $this->staticContext->getAreaCode(),
+                'theme' => $this->staticContext->getThemePath(),
+                'locale' => $this->staticContext->getLocale(),
+            ]
+        );
         if ($map) {
             $relativePath = implode('/', $map) . '/' . Config::MIXINS_FILE_NAME;
         } else {
@@ -254,11 +257,14 @@ public function getMinResolverRelativePath()
      */
     public function getUrlResolverFileRelativePath()
     {
-        $map = $this->getRepositoryFilesMap(Config::URL_RESOLVER_FILE_NAME, [
-            'area' => $this->staticContext->getAreaCode(),
-            'theme' => $this->staticContext->getThemePath(),
-            'locale' => $this->staticContext->getLocale(),
-        ]);
+        $map = $this->getRepositoryFilesMap(
+            Config::URL_RESOLVER_FILE_NAME,
+            [
+                'area' => $this->staticContext->getAreaCode(),
+                'theme' => $this->staticContext->getThemePath(),
+                'locale' => $this->staticContext->getLocale(),
+            ]
+        );
         if ($map) {
             $relativePath = implode('/', $map) . '/' . Config::URL_RESOLVER_FILE_NAME;
         } else {
@@ -278,6 +284,8 @@ public function getMapFileRelativePath()
     }
 
     /**
+     * Get path to configuration file
+     *
      * @return string
      */
     protected function getConfigFileName()
@@ -286,19 +294,22 @@ protected function getConfigFileName()
     }
 
     /**
+     * Get resolver code which RequireJS fetch minified files instead
+     *
      * @return string
      */
     public function getMinResolverCode()
     {
-        $excludes = [];
+        $excludes = ['url.indexOf(baseUrl) === 0'];
         foreach ($this->minification->getExcludes('js') as $expression) {
             $excludes[] = '!url.match(/' . str_replace('/', '\/', $expression) . '/)';
         }
         $excludesCode = empty($excludes) ? 'true' : implode('&&', $excludes);
 
         $result = <<<code
     var ctx = require.s.contexts._,
-        origNameToUrl = ctx.nameToUrl;
+        origNameToUrl = ctx.nameToUrl,
+        baseUrl = ctx.config.baseUrl;
 
     ctx.nameToUrl = function() {
         var url = origNameToUrl.apply(ctx, arguments);
@@ -317,6 +328,8 @@ public function getMinResolverCode()
     }
 
     /**
+     * Get map for given file.
+     *
      * @param string $fileId
      * @param array $params
      * @return array

lib/internal/Magento/Framework/RequireJs/Test/Unit/ConfigTest.php

@@ -101,9 +101,13 @@ public function testGetConfig()
     {
         $this->fileReader->expects($this->any())
             ->method('readAll')
-            ->will($this->returnCallback(function ($file) {
-                return $file . ' content';
-            }));
+            ->will(
+                $this->returnCallback(
+                    function ($file) {
+                        return $file . ' content';
+                    }
+                )
+            );
         $fileOne = $this->createMock(\Magento\Framework\View\File::class);
         $fileOne->expects($this->once())
             ->method('getFilename')
@@ -180,11 +184,12 @@ public function testGetMinResolverCode()
 
         $expected = <<<code
     var ctx = require.s.contexts._,
-        origNameToUrl = ctx.nameToUrl;
+        origNameToUrl = ctx.nameToUrl,
+        baseUrl = ctx.config.baseUrl;
 
     ctx.nameToUrl = function() {
         var url = origNameToUrl.apply(ctx, arguments);
-        if (!url.match(/\.min\./)) {
+        if (url.indexOf(baseUrl) === 0&&!url.match(/\.min\./)) {
             url = url.replace(/(\.min)?\.js$/, '.min.js');
         }
         return url;