Skip to content

Commit ddc02d0

Browse files
authored
Merge branch 'trunk' into add/code_coverage_speculation_rules
2 parents 04a08ac + 68c6deb commit ddc02d0

File tree

66 files changed

+1064
-564
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1064
-564
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ The feature plugins which are currently featured by this plugin are:
1111

1212
Plugin | Slug | Experimental | Links
1313
--------------------------------|---------------------------|--------------|-------------
14+
[Embed Optimizer][5] | `embed-optimizer` | No | [Source][13], [Issues][21], [PRs][29]
1415
[Image Placeholders][1] | `dominant-color-images` | No | [Source][9], [Issues][17], [PRs][25]
16+
[Image Prioritizer][7] | `image-prioritizer` | No | [Source][15], [Issues][23], [PRs][31]
1517
[Modern Image Formats][2] | `webp-uploads` | No | [Source][10], [Issues][18], [PRs][26]
1618
[Performant Translations][3] | `performant-translations` | No | [Source][11], [Issues][19], [PRs][27]
1719
[Speculative Loading][4] | `speculation-rules` | No | [Source][12], [Issues][20], [PRs][28]
18-
[Embed Optimizer][5] | `embed-optimizer` | Yes | [Source][13], [Issues][21], [PRs][29]
1920
[Enhanced Responsive Images][6] | `auto-sizes` | Yes | [Source][14], [Issues][22], [PRs][30]
20-
[Image Prioritizer][7] | `image-prioritizer` | Yes | [Source][15], [Issues][23], [PRs][31]
2121
[Web Worker Offloading][8] | `web-worker-offloading` | Yes | [Source][16], [Issues][24], [PRs][32]
2222

2323
[1]: https://wordpress.org/plugins/dominant-color-images/

package-lock.json

Lines changed: 162 additions & 168 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
},
1313
"devDependencies": {
1414
"@octokit/rest": "^21.1.0",
15-
"@wordpress/env": "^10.16.0",
16-
"@wordpress/prettier-config": "^4.14.0",
17-
"@wordpress/scripts": "^30.9.0",
15+
"@wordpress/env": "^10.17.0",
16+
"@wordpress/prettier-config": "^4.17.0",
17+
"@wordpress/scripts": "^30.10.0",
1818
"commander": "13.1.0",
1919
"copy-webpack-plugin": "^12.0.2",
2020
"css-minimizer-webpack-plugin": "^7.0.0",

plugins/embed-optimizer/class-embed-optimizer-tag-visitor.php

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,21 @@ private function reduce_layout_shifts( OD_Tag_Visitor_Context $context ): void {
185185

186186
$style_rules = array();
187187
foreach ( $minimums as $minimum ) {
188-
$style_rules[] = sprintf(
189-
'@media %s { #%s { min-height: %dpx; } }',
190-
od_generate_media_query( $minimum['group']->get_minimum_viewport_width(), $minimum['group']->get_maximum_viewport_width() ),
188+
$style_rule = sprintf(
189+
'#%s { min-height: %dpx; }',
191190
$element_id,
192191
$minimum['height']
193192
);
193+
194+
$media_feature = od_generate_media_query( $minimum['group']->get_minimum_viewport_width(), $minimum['group']->get_maximum_viewport_width() );
195+
if ( null !== $media_feature ) {
196+
$style_rule = sprintf(
197+
'@media %s { %s }',
198+
$media_feature,
199+
$style_rule
200+
);
201+
}
202+
$style_rules[] = $style_rule;
194203
}
195204

196205
$processor->append_head_html( sprintf( "<style>\n%s\n</style>\n", join( "\n", $style_rules ) ) );

plugins/embed-optimizer/tests/test-cases/all-embeds-inside-viewport/expected.html

Lines changed: 36 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/embed-optimizer/tests/test-cases/nested-figure-embed/expected.html

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/embed-optimizer/tests/test-cases/single-spotify-embed-outside-viewport-with-subsequent-script/expected.html

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<html lang="en">
2+
<head>
3+
<meta charset="utf-8">
4+
<title>...</title>
5+
</head>
6+
<body>
7+
<div class="wp-site-blocks">
8+
<figure class="wp-block-embed is-type-rich is-provider-twitter wp-block-embed-twitter">
9+
<div class="wp-block-embed__wrapper">
10+
<blockquote class="twitter-tweet" data-width="550" data-dnt="true"><p lang="en" dir="ltr">We want your feedback for the Privacy Sandbox 📨<br><br>Learn why your feedback is critical through real examples and learn how to provide it ↓ <a href="https://t.co/anGk6gWkbc">https://t.co/anGk6gWkbc</a></p>&mdash; Chrome for Developers (@ChromiumDev) <a href="https://twitter.com/ChromiumDev/status/1636796541368139777?ref_src=twsrc%5Etfw">March 17, 2023</a></blockquote>
11+
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
12+
</div>
13+
</figure>
14+
</div>
15+
</body>
16+
</html>

plugins/embed-optimizer/tests/test-cases/single-twitter-embed-inside-viewport-one-group/expected.html

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?php
2+
return static function ( Test_Embed_Optimizer_Optimization_Detective $test_case ): void {
3+
add_filter( 'od_breakpoint_max_widths', '__return_empty_array' );
4+
5+
$test_case->populate_url_metrics(
6+
array(
7+
array(
8+
'xpath' => '/HTML/BODY/DIV[@class=\'wp-site-blocks\']/*[1][self::FIGURE]/*[1][self::DIV]',
9+
'isLCP' => true,
10+
'intersectionRatio' => 1,
11+
'resizedBoundingClientRect' => array_merge( $test_case->get_sample_dom_rect(), array( 'height' => 500 ) ),
12+
),
13+
)
14+
);
15+
};

0 commit comments

Comments
 (0)