Merge branch 'trunk' into feature/1511-incorporate-layout-constraints-from-ancestors

Author: joemcgill

.github/workflows/php-test-plugins.yml

@@ -87,7 +87,7 @@ jobs:
           fi
       - name: Upload single site coverage reports to Codecov
         if: ${{ matrix.coverage == true }}
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage-${{ github.sha }}.xml
@@ -96,7 +96,7 @@ jobs:
           fail_ci_if_error: true
       - name: Upload multisite coverage reports to Codecov
         if: ${{ matrix.coverage == true }}
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: coverage-multisite-${{ github.sha }}.xml

composer.lock

@@ -12,14 +12,14 @@
   },
   "devDependencies": {
     "@octokit/rest": "^21.0.2",
-    "@wordpress/env": "^10.11.0",
-    "@wordpress/prettier-config": "^4.11.0",
-    "@wordpress/scripts": "^30.4.0",
+    "@wordpress/env": "^10.12.0",
+    "@wordpress/prettier-config": "^4.12.0",
+    "@wordpress/scripts": "^30.5.1",
     "commander": "12.1.0",
     "copy-webpack-plugin": "^12.0.2",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
-    "husky": "^9.1.6",
+    "husky": "^9.1.7",
     "lint-staged": "^15.2.10",
     "lodash": "4.17.21",
     "micromatch": "^4.0.8",

package-lock.json

@@ -81,6 +81,7 @@ private function is_embed_wrapper( OD_HTML_Tag_Processor $processor ): bool {
 	 * Otherwise, if the embed is not in any initial viewport, it will add lazy-loading logic.
 	 *
 	 * @since 0.2.0
+	 * @since n.e.x.t Adds preconnect links for each viewport group and skips if the element is not in the viewport for that group.
 	 *
 	 * @param OD_Tag_Visitor_Context $context Tag visitor context.
 	 * @return bool Whether the tag should be tracked in URL Metrics.
@@ -109,7 +110,8 @@ public function __invoke( OD_Tag_Visitor_Context $context ): bool {
 			&&
 			$context->url_metric_group_collection->get_last_group()->count() > 0
 		) {
-			$max_intersection_ratio = $context->url_metric_group_collection->get_element_max_intersection_ratio( self::get_embed_wrapper_xpath( $processor->get_xpath() ) );
+			$embed_wrapper_xpath    = self::get_embed_wrapper_xpath( $processor->get_xpath() );
+			$max_intersection_ratio = $context->url_metric_group_collection->get_element_max_intersection_ratio( $embed_wrapper_xpath );
 			if ( $max_intersection_ratio > 0 ) {
 				/*
 				 * The following embeds have been chosen for optimization due to their relative popularity among all embed types.
@@ -171,12 +173,20 @@ public function __invoke( OD_Tag_Visitor_Context $context ): bool {
 				}
 
 				foreach ( $preconnect_hrefs as $preconnect_href ) {
-					$context->link_collection->add_link(
-						array(
-							'rel'  => 'preconnect',
-							'href' => $preconnect_href,
-						)
-					);
+					foreach ( $context->url_metric_group_collection as $group ) {
+						if ( ! ( $group->get_element_max_intersection_ratio( $embed_wrapper_xpath ) > 0.0 ) ) {
+							continue;
+						}
+
+						$context->link_collection->add_link(
+							array(
+								'rel'  => 'preconnect',
+								'href' => $preconnect_href,
+							),
+							$group->get_minimum_viewport_width(),
+							$group->get_maximum_viewport_width()
+						);
+					}
 				}
 			} elseif ( embed_optimizer_update_markup( $processor, false ) && ! $this->added_lazy_script ) {
 				$processor->append_body_html( wp_get_inline_script_tag( embed_optimizer_get_lazy_load_script(), array( 'type' => 'module' ) ) );

package.json

@@ -42,7 +42,7 @@ function embed_optimizer_add_non_optimization_detective_hooks(): void {
  * @param string $optimization_detective_version Current version of the optimization detective plugin.
  */
 function embed_optimizer_init_optimization_detective( string $optimization_detective_version ): void {
-	$required_od_version = '0.7.0';
+	$required_od_version = '0.9.0';
 	if ( version_compare( (string) strtok( $optimization_detective_version, '-' ), $required_od_version, '<' ) ) {
 		add_action(
 			'admin_notices',

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

@@ -67,12 +67,6 @@ The [plugin source code](https://github.com/WordPress/performance/tree/trunk/plu
 
 == Changelog ==
 
-= n.e.x.t =
-
-**Enhancements**
-
-* Serve unminified scripts when `SCRIPT_DEBUG` is enabled. ([1643](https://github.com/WordPress/performance/pull/1643))
-
 = 0.3.0 =
 
 **Enhancements**

plugins/embed-optimizer/hooks.php

@@ -33,8 +33,8 @@
 			<head>
 				<meta charset="utf-8">
 				<title>...</title>
-				<link data-od-added-tag rel="preconnect" href="https://syndication.twitter.com">
 				<link data-od-added-tag rel="preconnect" href="https://pbs.twimg.com">
+				<link data-od-added-tag rel="preconnect" href="https://syndication.twitter.com">
 			</head>
 			<body>
 				<figure class="wp-block-embed is-type-rich is-provider-twitter wp-block-embed-twitter">

plugins/embed-optimizer/readme.txt

@@ -39,8 +39,8 @@
 				@media (min-width: 601px) and (max-width: 782px) { #embed-optimizer-a7659db28ecaa36ddee6ae66857dabd8 { min-height: 500px; } }
 				@media (min-width: 783px) { #embed-optimizer-a7659db28ecaa36ddee6ae66857dabd8 { min-height: 500px; } }
 				</style>
-				<link data-od-added-tag rel="preconnect" href="https://syndication.twitter.com">
 				<link data-od-added-tag rel="preconnect" href="https://pbs.twimg.com">
+				<link data-od-added-tag rel="preconnect" href="https://syndication.twitter.com">
 			</head>
 			<body>
 				<figure data-od-added-id id="embed-optimizer-a7659db28ecaa36ddee6ae66857dabd8" class="wp-block-embed is-type-rich is-provider-twitter wp-block-embed-twitter">