@@ -69,6 +69,11 @@ protected function renderAssetHtml(\Magento\Framework\View\Asset\PropertyGroup $
69
69
$ removeAdobeJSJunk = boolval ($ this ->config ->getValue ('react_vue_config/junk/remove ' ));
70
70
$ removeCSSjunk = boolval ($ this ->config ->getValue ('react_vue_config/css/remove ' ));
71
71
72
+ if (isset ($ _GET ['css-test ' ])){
73
+ // Css test mode
74
+ $ removeCSSjunk = false ;
75
+ }
76
+
72
77
$ area = $ this ->state ->getAreaCode ();
73
78
$ pageFilter = ['checkout ' , 'customer ' ];
74
79
@@ -96,7 +101,7 @@ protected function renderAssetHtml(\Magento\Framework\View\Asset\PropertyGroup $
96
101
/** @var $asset \Magento\Framework\View\Asset\AssetInterface */
97
102
// Changes Start
98
103
$ baseURL = $ this ->store ->getStore ()->getBaseUrl (\Magento \Framework \UrlInterface::URL_TYPE_STATIC );
99
- if ($ type === 'css ' ) {
104
+ if ($ removeCSSjunk && $ type === 'css ' ) {
100
105
foreach ($ assets as $ key => $ asset ) {
101
106
if (in_array ($ actionName , $ this ->actionFilter ) && strpos ($ asset ->getUrl (), 'styles-m ' )) {
102
107
// http://**/static/version1642788857/frontend/Magento/luma/en_US/css/styles-m.css
@@ -231,27 +236,30 @@ protected function renderAssetHtml(\Magento\Framework\View\Asset\PropertyGroup $
231
236
$ this ->logger ->critical ($ e );
232
237
$ result .= sprintf ($ template , $ this ->urlBuilder ->getUrl ('' , ['_direct ' => 'core/index/notFound ' ]));
233
238
}
234
- // mobile CSS
235
- if ($ assetOptimized && !($ isProduct || $ isCategory )) {
236
- $ result = '<link rel="stylesheet" type="text/css" media="all" href=" ' . $ assetOptimized . '" /> ' . "\n" . $ result ;
237
- }
238
- if ($ assetOptimizedLarge ) {
239
- $ result = '<link rel="stylesheet" type="text/css" media="screen and (min-width: 768px)" href=" ' . $ assetOptimizedLarge . '" /> ' . "\n" . $ result ;
240
- }
241
- if ($ assetProductOptimized && $ isProduct ) {
242
- if (file_exists ($ optimisedProductCSSFileCriticalPath )) {
243
- $ result = '<link rel="stylesheet" type="text/css" media="all" href=" ' . $ optimisedProductCSSFileCriticalUrl . '" /> ' . "\n" . $ result ;
244
- $ result = '<link rel="stylesheet" media="print" onload="this.onload=null;this.media= \'all \';" href=" ' . $ assetProductOptimized . '" /> ' . "\n" . $ result ;
245
- } else {
246
- $ result = '<link rel="stylesheet" type="text/css" media="all" href=" ' . $ assetProductOptimized . '" /> ' . "\n" . $ result ;
239
+
240
+ if ($ removeCSSjunk ) {
241
+ // mobile CSS
242
+ if ($ assetOptimized && !($ isProduct || $ isCategory )) {
243
+ $ result = '<link rel="stylesheet" type="text/css" media="all" href=" ' . $ assetOptimized . '" /> ' . "\n" . $ result ;
247
244
}
248
- }
249
- if ($ assetCategoryOptimized && $ isCategory ) {
250
- if (file_exists ($ optimisedCategoryCSSFileCriticalPath )) {
251
- $ result = '<link rel="stylesheet" type="text/css" media="all" href=" ' . $ optimisedCategoryCSSFileCriticalUrl . '" /> ' . "\n" . $ result ;
252
- $ result = '<link rel="stylesheet" media="print" onload="this.onload=null;this.media= \'all \';" href=" ' . $ assetCategoryOptimized . '" /> ' . "\n" . $ result ;
253
- } else {
254
- $ result = '<link rel="stylesheet" type="text/css" media="all" href=" ' . $ assetCategoryOptimized . '" /> ' . "\n" . $ result ;
245
+ if ($ assetOptimizedLarge ) {
246
+ $ result = '<link rel="stylesheet" type="text/css" media="screen and (min-width: 768px)" href=" ' . $ assetOptimizedLarge . '" /> ' . "\n" . $ result ;
247
+ }
248
+ if ($ assetProductOptimized && $ isProduct ) {
249
+ if (file_exists ($ optimisedProductCSSFileCriticalPath )) {
250
+ $ result = '<link rel="stylesheet" type="text/css" media="all" href=" ' . $ optimisedProductCSSFileCriticalUrl . '" /> ' . "\n" . $ result ;
251
+ $ result = '<link rel="stylesheet" media="print" onload="this.onload=null;this.media= \'all \';" href=" ' . $ assetProductOptimized . '" /> ' . "\n" . $ result ;
252
+ } else {
253
+ $ result = '<link rel="stylesheet" type="text/css" media="all" href=" ' . $ assetProductOptimized . '" /> ' . "\n" . $ result ;
254
+ }
255
+ }
256
+ if ($ assetCategoryOptimized && $ isCategory ) {
257
+ if (file_exists ($ optimisedCategoryCSSFileCriticalPath )) {
258
+ $ result = '<link rel="stylesheet" type="text/css" media="all" href=" ' . $ optimisedCategoryCSSFileCriticalUrl . '" /> ' . "\n" . $ result ;
259
+ $ result = '<link rel="stylesheet" media="print" onload="this.onload=null;this.media= \'all \';" href=" ' . $ assetCategoryOptimized . '" /> ' . "\n" . $ result ;
260
+ } else {
261
+ $ result = '<link rel="stylesheet" type="text/css" media="all" href=" ' . $ assetCategoryOptimized . '" /> ' . "\n" . $ result ;
262
+ }
255
263
}
256
264
}
257
265
0 commit comments