UPSTREAM FIX

magento2-35580: Renders critical CSS before assets and adds a critical head block

Community fix magento2-35580 merged into magento/magento2 on 2024-07-14, released in 2.4.8; applies cleanly to 27 releases from 2.4.6 to 2.4.7-p10.

Renders critical CSS before assets and adds a critical head block edited

Pull request title: Code cleanup and add new critical head block and move critical css before assets
Pull request: magento/magento2#35580
Issues: #38748 pr-derived
Author: @in-session
Merged: 2024-07-14
Fixed in: 2.4.8
Reported on: —
Categories: Performance
Components: magento/framework, magento/module-catalog, magento/module-theme

Labels

Area: Performance
Component: Frontend
Priority: P2
Severity: —
Reported on (labels): 2.4.x

Issue

Title and steps come from the upstream issue and pull request.

Description

The critical css should appear before the assets. In addition, the changes provide many more opportunities to insert custom blocks between the meta details and assets via template or xml blocks. These include, for example, own meta specifications which are not controllable via XML, as well as assets from the template which must be inserted before other files, for example, constentscripts or special preloads, og:meta tags.

Steps to reproduce

1. Use CSS critical path

Taken from the upstream pull request.

Code match per tag

Each tag was checked with git apply --check against that tag's files. A clean match means the change applies; it is not a test result. Tags that already contain the fix are marked.

Line	Code match per tag	Tests
2.4.6	2.4.6 clean 2.4.6-p1 clean 2.4.6-p2 clean 2.4.6-p3 clean 2.4.6-p4 clean 2.4.6-p5 clean 2.4.6-p6 clean 2.4.6-p7 clean 2.4.6-p8 clean 2.4.6-p9 clean 2.4.6-p10 clean 2.4.6-p11 clean 2.4.6-p12 clean 2.4.6-p13 clean 2.4.6-p14 clean 2.4.6-p15 clean	2.4.6: no test data 2.4.6-p1: no test data 2.4.6-p2: no test data 2.4.6-p3: no test data 2.4.6-p4: no test data 2.4.6-p5: no test data 2.4.6-p6: no test data 2.4.6-p7: no test data 2.4.6-p8: no test data 2.4.6-p9: no test data 2.4.6-p10: no test data 2.4.6-p11: no test data 2.4.6-p12: no test data 2.4.6-p13: no test data 2.4.6-p14: no test data 2.4.6-p15: no test data
2.4.7	2.4.7 clean 2.4.7-p1 clean 2.4.7-p2 clean 2.4.7-p3 clean 2.4.7-p4 clean 2.4.7-p5 clean 2.4.7-p6 clean 2.4.7-p7 clean 2.4.7-p8 clean 2.4.7-p9 clean 2.4.7-p10 clean	2.4.7: no test data 2.4.7-p1: no test data 2.4.7-p2: no test data 2.4.7-p3: no test data 2.4.7-p4: no test data 2.4.7-p5: no test data 2.4.7-p6: no test data 2.4.7-p7: no test data 2.4.7-p8: no test data 2.4.7-p9: no test data 2.4.7-p10: no test data
2.4.8	2.4.8 conflictcontains the fix 2.4.8-p1 conflictcontains the fix 2.4.8-p2 conflictcontains the fix 2.4.8-p3 conflictcontains the fix 2.4.8-p4 conflictcontains the fix 2.4.8-p5 conflictcontains the fix	2.4.8: no test data 2.4.8-p1: no test data 2.4.8-p2: no test data 2.4.8-p3: no test data 2.4.8-p4: no test data 2.4.8-p5: no test data
2.4.9	2.4.9 conflictcontains the fix	2.4.9: no test data

Triage

Model @cf/cloudflare/clef. Probability this is a bug fix: 13.3%. Probability it is security relevant: 0.8%.

Show the model's answers and probabilities

Question	Answer	Probabilities	Confidence
Change kind	refactor	refactor 54.8%, feature 35.6%, bugfix 7.8%, dependency 0.7%, tests_only 0.6%, docs_only 0.5%	31.9%
Area	frontend	frontend 66.7%, framework 27.4%, catalog 1.9%	45.3%
Reported version	unspecified	unspecified 13.9%, 2.4.6 2.7%, 2.4.9 2.2%	1.8%
Scope	1.52 of 2	2 56.7%, 1 38.6%, 0 4.7%	20.9%
Risk	0.83 of 2	1 74.6%, 0 21.1%, 2 4.3%	40.5%
Worth backporting	0.74 of 2	1 42.6%, 0 41.6%, 2 15.8%	6.9%

Download

For cweagans/composer-patches, choose a version below and download the bundle. Copy its magento2-35580/ folder into patches/composer/, merge composer.patches.json into composer.json, then run composer install. Test files are always removed; paths are relative to each package root, using the default -p1 level.

Bundle README (what the ZIP ships)

# magento2-35580

Community fix merged upstream into magento/magento2, adapted by magento.watch.
This is not a patch published by Adobe.

Pull request: https://github.com/magento/magento2/pull/35580
Issue: https://github.com/magento/magento2/issues/38748
Author: @in-session
Source commit: 03648ecf2399ad2d01d4fa0813d2fa713715479b
Modifications: test files and documentation removed, paths rewritten relative to each Composer package.
Licence: OSL-3.0 / AFL-3.0, as the original Magento Open Source code.
Maintainer: Łukasz Bajsarowicz (@lbajsarowicz)

Licence: Magento Open Source code under OSL-3.0 and AFL-3.0. The bundle carries the original author, source commit and the list of modifications.