Skip to content

Commit 1cf39d1

Browse files
AndriyNasinnykAndriyNasinnyk
committed
MAGETWO-39965: Invalid path parsing in exclude list during bundle collecting
1 parent 29e7a42 commit 1cf39d1

File tree

5 files changed

+109
-109
lines changed

5 files changed

+109
-109
lines changed

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

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -10,53 +10,53 @@
1010
<var name="bundle_size">1MB</var>
1111
</vars>
1212
<exclude>
13-
<item type="file">Magento_Lib::mage/common.js</item>
14-
<item type="file">Magento_Lib::mage/cookies.js</item>
15-
<item type="file">Magento_Lib::mage/dataPost.js</item>
16-
<item type="file">Magento_Lib::mage/decorate.js</item>
17-
<item type="file">Magento_Lib::mage/deletable-item.js</item>
18-
<item type="file">Magento_Lib::mage/dialog.js</item>
19-
<item type="file">Magento_Lib::mage/dropdown.js</item>
20-
<item type="file">Magento_Lib::mage/dropdowns.js</item>
21-
<item type="file">Magento_Lib::mage/fieldset-controls.js</item>
22-
<item type="file">Magento_Lib::mage/gallery-fullscreen.js</item>
23-
<item type="file">Magento_Lib::mage/gallery.js</item>
24-
<item type="file">Magento_Lib::mage/item-table.js</item>
25-
<item type="file">Magento_Lib::mage/list.js</item>
26-
<item type="file">Magento_Lib::mage/loader.js</item>
27-
<item type="file">Magento_Lib::mage/menu.js</item>
28-
<item type="file">Magento_Lib::mage/popup-window.js</item>
29-
<item type="file">Magento_Lib::mage/redirect-url.js</item>
30-
<item type="file">Magento_Lib::mage/sticky.js</item>
31-
<item type="file">Magento_Lib::mage/terms.js</item>
32-
<item type="file">Magento_Lib::mage/toggle.js</item>
33-
<item type="file">Magento_Lib::mage/tooltip.js</item>
34-
<item type="file">Magento_Lib::mage/translate-inline-vde.js</item>
35-
<item type="file">Magento_Lib::mage/webapi.js</item>
36-
<item type="file">Magento_Lib::mage/zoom.js</item>
37-
<item type="file">Magento_Lib::mage/validation/dob-rule.js</item>
38-
<item type="file">Magento_Lib::mage/validation/validation.js</item>
39-
<item type="file">Magento_Lib::mage/adminhtml/varienLoader.js</item>
40-
<item type="file">Magento_Lib::mage/adminhtml/tools.js</item>
41-
<item type="file">Magento_Lib::jquery/jquery.min.js</item>
42-
<item type="file">Magento_Lib::jquery/jquery.parsequery.js</item>
43-
<item type="file">Magento_Lib::jquery/jquery.mobile.custom.js</item>
44-
<item type="file">Magento_Lib::jquery/jquery-ui.js</item>
45-
<item type="file">Magento_Lib::jquery/jquery-ui.min.js</item>
46-
<item type="file">Magento_Lib::matchMedia.js</item>
47-
<item type="file">Magento_Lib::requirejs/require.js</item>
48-
<item type="file">Magento_Lib::date-format-normalizer.js</item>
49-
<item type="file">Magento_Lib::varien/js.js</item>
50-
<item type="directory">Magento_Lib::css</item>
51-
<item type="directory">Magento_Lib::lib</item>
52-
<item type="directory">Magento_Lib::prototype</item>
53-
<item type="directory">Magento_Lib::scriptaculous</item>
54-
<item type="directory">Magento_Lib::tiny_mce</item>
55-
<item type="directory">Magento_Lib::mage/requirejs</item>
56-
<item type="directory">Magento_Lib::tiny_mce/classes</item>
57-
<item type="directory">Magento_Lib::tiny_mce/langs</item>
58-
<item type="directory">Magento_Lib::tiny_mce/plugins</item>
59-
<item type="directory">Magento_Lib::tiny_mce/themes</item>
60-
<item type="directory">Magento_Lib::tiny_mce/utils</item>
13+
<item type="file">Lib::mage/common.js</item>
14+
<item type="file">Lib::mage/cookies.js</item>
15+
<item type="file">Lib::mage/dataPost.js</item>
16+
<item type="file">Lib::mage/decorate.js</item>
17+
<item type="file">Lib::mage/deletable-item.js</item>
18+
<item type="file">Lib::mage/dialog.js</item>
19+
<item type="file">Lib::mage/dropdown.js</item>
20+
<item type="file">Lib::mage/dropdowns.js</item>
21+
<item type="file">Lib::mage/fieldset-controls.js</item>
22+
<item type="file">Lib::mage/gallery-fullscreen.js</item>
23+
<item type="file">Lib::mage/gallery.js</item>
24+
<item type="file">Lib::mage/item-table.js</item>
25+
<item type="file">Lib::mage/list.js</item>
26+
<item type="file">Lib::mage/loader.js</item>
27+
<item type="file">Lib::mage/menu.js</item>
28+
<item type="file">Lib::mage/popup-window.js</item>
29+
<item type="file">Lib::mage/redirect-url.js</item>
30+
<item type="file">Lib::mage/sticky.js</item>
31+
<item type="file">Lib::mage/terms.js</item>
32+
<item type="file">Lib::mage/toggle.js</item>
33+
<item type="file">Lib::mage/tooltip.js</item>
34+
<item type="file">Lib::mage/translate-inline-vde.js</item>
35+
<item type="file">Lib::mage/webapi.js</item>
36+
<item type="file">Lib::mage/zoom.js</item>
37+
<item type="file">Lib::mage/validation/dob-rule.js</item>
38+
<item type="file">Lib::mage/validation/validation.js</item>
39+
<item type="file">Lib::mage/adminhtml/varienLoader.js</item>
40+
<item type="file">Lib::mage/adminhtml/tools.js</item>
41+
<item type="file">Lib::jquery/jquery.min.js</item>
42+
<item type="file">Lib::jquery/jquery.parsequery.js</item>
43+
<item type="file">Lib::jquery/jquery.mobile.custom.js</item>
44+
<item type="file">Lib::jquery/jquery-ui.js</item>
45+
<item type="file">Lib::jquery/jquery-ui.min.js</item>
46+
<item type="file">Lib::matchMedia.js</item>
47+
<item type="file">Lib::requirejs/require.js</item>
48+
<item type="file">Lib::date-format-normalizer.js</item>
49+
<item type="file">Lib::varien/js.js</item>
50+
<item type="directory">Lib::css</item>
51+
<item type="directory">Lib::lib</item>
52+
<item type="directory">Lib::prototype</item>
53+
<item type="directory">Lib::scriptaculous</item>
54+
<item type="directory">Lib::tiny_mce</item>
55+
<item type="directory">Lib::mage/requirejs</item>
56+
<item type="directory">Lib::tiny_mce/classes</item>
57+
<item type="directory">Lib::tiny_mce/langs</item>
58+
<item type="directory">Lib::tiny_mce/plugins</item>
59+
<item type="directory">Lib::tiny_mce/themes</item>
60+
<item type="directory">Lib::tiny_mce/utils</item>
6161
</exclude>
6262
</view>

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

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -201,34 +201,34 @@
201201
<var name="bundle_size">1MB</var>
202202
</vars>
203203
<exclude>
204-
<item type="file">Magento_Lib::jquery/jquery-ui-1.9.2.js</item>
205-
<item type="file">Magento_Lib::jquery/jquery.ba-hashchange.min.js</item>
206-
<item type="file">Magento_Lib::jquery/jquery.details.js</item>
207-
<item type="file">Magento_Lib::jquery/jquery.details.min.js</item>
208-
<item type="file">Magento_Lib::jquery/jquery.hoverIntent.js</item>
209-
<item type="file">Magento_Lib::jquery/jquery.min.js</item>
210-
<item type="file">Magento_Lib::mage/captcha.js</item>
211-
<item type="file">Magento_Lib::mage/dropdown_old.js</item>
212-
<item type="file">Magento_Lib::mage/list.js</item>
213-
<item type="file">Magento_Lib::mage/loader_old.js</item>
214-
<item type="file">Magento_Lib::mage/webapi.js</item>
215-
<item type="file">Magento_Lib::moment.js</item>
216-
<item type="file">Magento_Lib::requirejs/require.js</item>
217-
<item type="file">Magento_Lib::date-format-normalizer.js</item>
218-
<item type="file">Magento_Lib::legacy-build.min.js</item>
219-
<item type="directory">Magento_Lib::modernizr</item>
220-
<item type="directory">Magento_Lib::tiny_mce</item>
221-
<item type="directory">Magento_Lib::varien</item>
222-
<item type="directory">Magento_Lib::jquery/editableMultiselect</item>
223-
<item type="directory">Magento_Lib::jquery/jstree</item>
224-
<item type="directory">Magento_Lib::jquery/fileUploader</item>
225-
<item type="directory">Magento_Lib::css</item>
226-
<item type="directory">Magento_Lib::lib</item>
227-
<item type="directory">Magento_Lib::extjs</item>
228-
<item type="directory">Magento_Lib::prototype</item>
229-
<item type="directory">Magento_Lib::scriptaculous</item>
230-
<item type="directory">Magento_Lib::mage/requirejs</item>
231-
<item type="directory">Magento_Lib::mage/adminhtml</item>
232-
<item type="directory">Magento_Lib::mage/backend</item>
204+
<item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
205+
<item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
206+
<item type="file">Lib::jquery/jquery.details.js</item>
207+
<item type="file">Lib::jquery/jquery.details.min.js</item>
208+
<item type="file">Lib::jquery/jquery.hoverIntent.js</item>
209+
<item type="file">Lib::jquery/jquery.min.js</item>
210+
<item type="file">Lib::mage/captcha.js</item>
211+
<item type="file">Lib::mage/dropdown_old.js</item>
212+
<item type="file">Lib::mage/list.js</item>
213+
<item type="file">Lib::mage/loader_old.js</item>
214+
<item type="file">Lib::mage/webapi.js</item>
215+
<item type="file">Lib::moment.js</item>
216+
<item type="file">Lib::requirejs/require.js</item>
217+
<item type="file">Lib::date-format-normalizer.js</item>
218+
<item type="file">Lib::legacy-build.min.js</item>
219+
<item type="directory">Lib::modernizr</item>
220+
<item type="directory">Lib::tiny_mce</item>
221+
<item type="directory">Lib::varien</item>
222+
<item type="directory">Lib::jquery/editableMultiselect</item>
223+
<item type="directory">Lib::jquery/jstree</item>
224+
<item type="directory">Lib::jquery/fileUploader</item>
225+
<item type="directory">Lib::css</item>
226+
<item type="directory">Lib::lib</item>
227+
<item type="directory">Lib::extjs</item>
228+
<item type="directory">Lib::prototype</item>
229+
<item type="directory">Lib::scriptaculous</item>
230+
<item type="directory">Lib::mage/requirejs</item>
231+
<item type="directory">Lib::mage/adminhtml</item>
232+
<item type="directory">Lib::mage/backend</item>
233233
</exclude>
234234
</view>

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

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -206,34 +206,34 @@
206206
<var name="bundle_size">1MB</var>
207207
</vars>
208208
<exclude>
209-
<item type="file">Magento_Lib::jquery/jquery-ui-1.9.2.js</item>
210-
<item type="file">Magento_Lib::jquery/jquery.ba-hashchange.min.js</item>
211-
<item type="file">Magento_Lib::jquery/jquery.details.js</item>
212-
<item type="file">Magento_Lib::jquery/jquery.details.min.js</item>
213-
<item type="file">Magento_Lib::jquery/jquery.hoverIntent.js</item>
214-
<item type="file">Magento_Lib::jquery/jquery.min.js</item>
215-
<item type="file">Magento_Lib::mage/captcha.js</item>
216-
<item type="file">Magento_Lib::mage/dropdown_old.js</item>
217-
<item type="file">Magento_Lib::mage/list.js</item>
218-
<item type="file">Magento_Lib::mage/loader_old.js</item>
219-
<item type="file">Magento_Lib::mage/webapi.js</item>
220-
<item type="file">Magento_Lib::moment.js</item>
221-
<item type="file">Magento_Lib::requirejs/require.js</item>
222-
<item type="file">Magento_Lib::date-format-normalizer.js</item>
223-
<item type="file">Magento_Lib::legacy-build.min.js</item>
224-
<item type="directory">Magento_Lib::modernizr</item>
225-
<item type="directory">Magento_Lib::tiny_mce</item>
226-
<item type="directory">Magento_Lib::varien</item>
227-
<item type="directory">Magento_Lib::jquery/editableMultiselect</item>
228-
<item type="directory">Magento_Lib::jquery/jstree</item>
229-
<item type="directory">Magento_Lib::jquery/fileUploader</item>
230-
<item type="directory">Magento_Lib::css</item>
231-
<item type="directory">Magento_Lib::lib</item>
232-
<item type="directory">Magento_Lib::extjs</item>
233-
<item type="directory">Magento_Lib::prototype</item>
234-
<item type="directory">Magento_Lib::scriptaculous</item>
235-
<item type="directory">Magento_Lib::mage/requirejs</item>
236-
<item type="directory">Magento_Lib::mage/adminhtml</item>
237-
<item type="directory">Magento_Lib::mage/backend</item>
209+
<item type="file">Lib::jquery/jquery-ui-1.9.2.js</item>
210+
<item type="file">Lib::jquery/jquery.ba-hashchange.min.js</item>
211+
<item type="file">Lib::jquery/jquery.details.js</item>
212+
<item type="file">Lib::jquery/jquery.details.min.js</item>
213+
<item type="file">Lib::jquery/jquery.hoverIntent.js</item>
214+
<item type="file">Lib::jquery/jquery.min.js</item>
215+
<item type="file">Lib::mage/captcha.js</item>
216+
<item type="file">Lib::mage/dropdown_old.js</item>
217+
<item type="file">Lib::mage/list.js</item>
218+
<item type="file">Lib::mage/loader_old.js</item>
219+
<item type="file">Lib::mage/webapi.js</item>
220+
<item type="file">Lib::moment.js</item>
221+
<item type="file">Lib::requirejs/require.js</item>
222+
<item type="file">Lib::date-format-normalizer.js</item>
223+
<item type="file">Lib::legacy-build.min.js</item>
224+
<item type="directory">Lib::modernizr</item>
225+
<item type="directory">Lib::tiny_mce</item>
226+
<item type="directory">Lib::varien</item>
227+
<item type="directory">Lib::jquery/editableMultiselect</item>
228+
<item type="directory">Lib::jquery/jstree</item>
229+
<item type="directory">Lib::jquery/fileUploader</item>
230+
<item type="directory">Lib::css</item>
231+
<item type="directory">Lib::lib</item>
232+
<item type="directory">Lib::extjs</item>
233+
<item type="directory">Lib::prototype</item>
234+
<item type="directory">Lib::scriptaculous</item>
235+
<item type="directory">Lib::mage/requirejs</item>
236+
<item type="directory">Lib::mage/adminhtml</item>
237+
<item type="directory">Lib::mage/backend</item>
238238
</exclude>
239239
</view>

‎lib/internal/Magento/Framework/View/Asset/Bundle/Manager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ protected function isExcludedFile($filePath, $asset)
134134
protected function compareModules($filePathInfo, $asset)
135135
{
136136
/** @var $asset LocalInterface */
137-
if (($filePathInfo['excludedModule'] == 'Magento_Lib' && $asset->getModule() == '')
137+
if (($filePathInfo['excludedModule'] == 'Lib' && $asset->getModule() == '')
138138
|| ($filePathInfo['excludedModule'] == $asset->getModule())
139139
) {
140140
return true;

‎lib/internal/Magento/Framework/View/Test/Unit/Asset/Bundle/ManagerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function testAddAssetWithExcludedFile()
110110
->willReturn($configView);
111111
$configView->expects($this->once())
112112
->method('getExcludedFiles')
113-
->willReturn(['Magento_Lib::file/path.js']);
113+
->willReturn(['Lib:' . ':file/path.js']);
114114

115115
$this->assertFalse($this->manager->addAsset($this->asset));
116116
}
@@ -152,7 +152,7 @@ public function testAddAssetWithExcludedDirectory()
152152
->willReturn([]);
153153
$configView->expects($this->once())
154154
->method('getExcludedDir')
155-
->willReturn(['Magento_Lib::file']);
155+
->willReturn(['Lib:' . ':file']);
156156

157157
$this->assertFalse($this->manager->addAsset($this->asset));
158158
}

0 commit comments

Comments
 (0)