Skip to content

Commit 36d389f

Browse files
authored
ENGCOM-5815: Fixes excluding js files from bundles when minifying is enabled #24506
2 parents 5c561ec + 26f5571 commit 36d389f

File tree

4 files changed

+1
-14
lines changed

4 files changed

+1
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ private function isExcluded($filePath, $area, $theme)
216216
$excludedFiles = $this->bundleConfig->getExcludedFiles($area, $theme);
217217
foreach ($excludedFiles as $excludedFileId) {
218218
$excludedFilePath = $this->prepareExcludePath($excludedFileId);
219-
if ($excludedFilePath === $filePath) {
219+
if ($excludedFilePath === $filePath || $excludedFilePath === str_replace('.min.js', '.js', $filePath)) {
220220
return true;
221221
}
222222
}

app/design/adminhtml/Magento/backend/etc/view.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
</media>
2525
<exclude>
2626
<item type="file">Lib::mage/captcha.js</item>
27-
<item type="file">Lib::mage/captcha.min.js</item>
2827
<item type="file">Lib::mage/common.js</item>
2928
<item type="file">Lib::mage/cookies.js</item>
3029
<item type="file">Lib::mage/dataPost.js</item>
@@ -46,7 +45,6 @@
4645
<item type="file">Lib::mage/translate-inline-vde.js</item>
4746
<item type="file">Lib::mage/webapi.js</item>
4847
<item type="file">Lib::mage/zoom.js</item>
49-
<item type="file">Lib::mage/validation/dob-rule.js</item>
5048
<item type="file">Lib::mage/validation/validation.js</item>
5149
<item type="file">Lib::mage/adminhtml/varienLoader.js</item>
5250
<item type="file">Lib::mage/adminhtml/tools.js</item>
@@ -57,11 +55,9 @@
5755
<item type="file">Lib::jquery/jquery.parsequery.js</item>
5856
<item type="file">Lib::jquery/jquery.mobile.custom.js</item>
5957
<item type="file">Lib::jquery/jquery-ui.js</item>
60-
<item type="file">Lib::jquery/jquery-ui.min.js</item>
6158
<item type="file">Lib::matchMedia.js</item>
6259
<item type="file">Lib::requirejs/require.js</item>
6360
<item type="file">Lib::requirejs/text.js</item>
64-
<item type="file">Lib::date-format-normalizer.js</item>
6561
<item type="file">Lib::varien/js.js</item>
6662
<item type="directory">Magento_Tinymce3::tiny_mce</item>
6763
<item type="directory">Lib::css</item>
@@ -73,10 +69,5 @@
7369
<item type="directory">Lib::fotorama</item>
7470
<item type="directory">Lib::magnifier</item>
7571
<item type="directory">Lib::tiny_mce</item>
76-
<item type="directory">Lib::tiny_mce/classes</item>
77-
<item type="directory">Lib::tiny_mce/langs</item>
78-
<item type="directory">Lib::tiny_mce/plugins</item>
79-
<item type="directory">Lib::tiny_mce/themes</item>
80-
<item type="directory">Lib::tiny_mce/utils</item>
8172
</exclude>
8273
</view>

app/design/frontend/Magento/blank/etc/view.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,10 @@
262262
<item type="file">Lib::jquery/jquery.min.js</item>
263263
<item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
264264
<item type="file">Lib::jquery/jquery.details.js</item>
265-
<item type="file">Lib::jquery/jquery.details.min.js</item>
266265
<item type="file">Lib::jquery/jquery.hoverIntent.js</item>
267266
<item type="file">Lib::jquery/colorpicker/js/colorpicker.js</item>
268267
<item type="file">Lib::requirejs/require.js</item>
269268
<item type="file">Lib::requirejs/text.js</item>
270-
<item type="file">Lib::date-format-normalizer.js</item>
271269
<item type="file">Lib::legacy-build.min.js</item>
272270
<item type="file">Lib::mage/captcha.js</item>
273271
<item type="file">Lib::mage/dropdown_old.js</item>

app/design/frontend/Magento/luma/etc/view.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,12 +273,10 @@
273273
<item type="file">Lib::jquery/jquery.min.js</item>
274274
<item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
275275
<item type="file">Lib::jquery/jquery.details.js</item>
276-
<item type="file">Lib::jquery/jquery.details.min.js</item>
277276
<item type="file">Lib::jquery/jquery.hoverIntent.js</item>
278277
<item type="file">Lib::jquery/colorpicker/js/colorpicker.js</item>
279278
<item type="file">Lib::requirejs/require.js</item>
280279
<item type="file">Lib::requirejs/text.js</item>
281-
<item type="file">Lib::date-format-normalizer.js</item>
282280
<item type="file">Lib::legacy-build.min.js</item>
283281
<item type="file">Lib::mage/captcha.js</item>
284282
<item type="file">Lib::mage/dropdown_old.js</item>

0 commit comments

Comments
 (0)