ENGCOM-5815: Fixes excluding js files from bundles when minifying is …

…enabled #24506
magento · Sep 13, 2019 · 36d389f · 36d389f
2 parents 5c561ec + 26f5571
commit 36d389f
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 14 deletions.
diff --git a/app/code/Magento/Deploy/Service/Bundle.php b/app/code/Magento/Deploy/Service/Bundle.php
@@ -216,7 +216,7 @@ private function isExcluded($filePath, $area, $theme)
         $excludedFiles = $this->bundleConfig->getExcludedFiles($area, $theme);
         foreach ($excludedFiles as $excludedFileId) {
             $excludedFilePath = $this->prepareExcludePath($excludedFileId);
-            if ($excludedFilePath === $filePath) {
+            if ($excludedFilePath === $filePath || $excludedFilePath === str_replace('.min.js', '.js', $filePath)) {
                 return true;
             }
         }

diff --git a/app/design/adminhtml/Magento/backend/etc/view.xml b/app/design/adminhtml/Magento/backend/etc/view.xml
@@ -24,7 +24,6 @@
     </media>
     <exclude>
         <item type="file">Lib::mage/captcha.js</item>
-        <item type="file">Lib::mage/captcha.min.js</item>
         <item type="file">Lib::mage/common.js</item>
         <item type="file">Lib::mage/cookies.js</item>
         <item type="file">Lib::mage/dataPost.js</item>
@@ -46,7 +45,6 @@
         <item type="file">Lib::mage/translate-inline-vde.js</item>
         <item type="file">Lib::mage/webapi.js</item>
         <item type="file">Lib::mage/zoom.js</item>
-        <item type="file">Lib::mage/validation/dob-rule.js</item>
         <item type="file">Lib::mage/validation/validation.js</item>
         <item type="file">Lib::mage/adminhtml/varienLoader.js</item>
         <item type="file">Lib::mage/adminhtml/tools.js</item>
@@ -57,11 +55,9 @@
         <item type="file">Lib::jquery/jquery.parsequery.js</item>
         <item type="file">Lib::jquery/jquery.mobile.custom.js</item>
         <item type="file">Lib::jquery/jquery-ui.js</item>
-        <item type="file">Lib::jquery/jquery-ui.min.js</item>
         <item type="file">Lib::matchMedia.js</item>
         <item type="file">Lib::requirejs/require.js</item>
         <item type="file">Lib::requirejs/text.js</item>
-        <item type="file">Lib::date-format-normalizer.js</item>
         <item type="file">Lib::varien/js.js</item>
         <item type="directory">Magento_Tinymce3::tiny_mce</item>
         <item type="directory">Lib::css</item>
@@ -73,10 +69,5 @@
         <item type="directory">Lib::fotorama</item>
         <item type="directory">Lib::magnifier</item>
         <item type="directory">Lib::tiny_mce</item>
-        <item type="directory">Lib::tiny_mce/classes</item>
-        <item type="directory">Lib::tiny_mce/langs</item>
-        <item type="directory">Lib::tiny_mce/plugins</item>
-        <item type="directory">Lib::tiny_mce/themes</item>
-        <item type="directory">Lib::tiny_mce/utils</item>
     </exclude>
 </view>
diff --git a/app/design/frontend/Magento/blank/etc/view.xml b/app/design/frontend/Magento/blank/etc/view.xml
@@ -262,12 +262,10 @@
         <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
         <item type="file">Lib::jquery/jquery.details.js</item>
-        <item type="file">Lib::jquery/jquery.details.min.js</item>
         <item type="file">Lib::jquery/jquery.hoverIntent.js</item>
         <item type="file">Lib::jquery/colorpicker/js/colorpicker.js</item>
         <item type="file">Lib::requirejs/require.js</item>
         <item type="file">Lib::requirejs/text.js</item>
-        <item type="file">Lib::date-format-normalizer.js</item>
         <item type="file">Lib::legacy-build.min.js</item>
         <item type="file">Lib::mage/captcha.js</item>
         <item type="file">Lib::mage/dropdown_old.js</item>

diff --git a/app/design/frontend/Magento/luma/etc/view.xml b/app/design/frontend/Magento/luma/etc/view.xml
@@ -273,12 +273,10 @@
         <item type="file">Lib::jquery/jquery.min.js</item>
         <item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
         <item type="file">Lib::jquery/jquery.details.js</item>
-        <item type="file">Lib::jquery/jquery.details.min.js</item>
         <item type="file">Lib::jquery/jquery.hoverIntent.js</item>
         <item type="file">Lib::jquery/colorpicker/js/colorpicker.js</item>
         <item type="file">Lib::requirejs/require.js</item>
         <item type="file">Lib::requirejs/text.js</item>
-        <item type="file">Lib::date-format-normalizer.js</item>
         <item type="file">Lib::legacy-build.min.js</item>
         <item type="file">Lib::mage/captcha.js</item>
         <item type="file">Lib::mage/dropdown_old.js</item>