Merge pull request #2013 from WordPress/fix/conflict

Fix merge conflict

Author: mukeshpanchal27

.eslintrc.js

@@ -25,6 +25,18 @@ const config = {
 		'/dist',
 		'/**/*.min.js',
 	],
+	overrides: [
+		...( wpConfig?.overrides || [] ),
+		{
+			files: [ 'plugins/view-transitions/js/**/*.js' ],
+			rules: {
+				'jsdoc/no-undefined-types': [
+					'error',
+					{ definedTypes: [ 'PageSwapEvent', 'PageRevealEvent' ] },
+				],
+			},
+		},
+	],
 };
 
 module.exports = config;

composer.lock

@@ -14,9 +14,9 @@
     "@octokit/rest": "^21.1.1",
     "@playwright/test": "^1.51.1",
     "@wordpress/e2e-test-utils-playwright": "^1.21.0",
-    "@wordpress/env": "^10.22.0",
-    "@wordpress/prettier-config": "^4.20.0",
-    "@wordpress/scripts": "^30.15.0",
+    "@wordpress/env": "^10.23.0",
+    "@wordpress/prettier-config": "^4.23.0",
+    "@wordpress/scripts": "^30.16.0",
     "commander": "13.1.0",
     "copy-webpack-plugin": "^13.0.0",
     "css-minimizer-webpack-plugin": "^7.0.2",

package-lock.json

@@ -16,7 +16,7 @@
  * Representation of the measurements taken from a single client's visit to a specific URL without additionalProperties allowed.
  *
  * This is used exclusively in the REST API endpoint for capturing new URL Metrics to prevent invalid additional data from being
- * submitted in the request. For URL Metrics which have been stored the looser OD_URL_Metric class is used instead.
+ * submitted in the request. For URL Metrics which have been stored, the looser OD_URL_Metric class is used instead.
  *
  * @phpstan-import-type JSONSchema from OD_URL_Metric
  *

package.json

@@ -124,7 +124,7 @@ public function __get( string $name ) {
 				throw new Error(
 					esc_html(
 						sprintf(
-							/* translators: %s is class member variable name */
+							/* translators: %s is the class member variable name */
 							__( 'Unknown property %s.', 'optimization-detective' ),
 							__CLASS__ . '::$' . $name
 						)

plugins/optimization-detective/class-od-strict-url-metric.php

@@ -114,7 +114,7 @@ public function __get( string $name ) {
 				throw new Error(
 					esc_html(
 						sprintf(
-							/* translators: %s is class member variable name */
+							/* translators: %s is the class member variable name */
 							__( 'Unknown property %s.', 'optimization-detective' ),
 							__CLASS__ . '::$' . $name
 						)

plugins/optimization-detective/class-od-tag-visitor-context.php

@@ -51,7 +51,7 @@ final class OD_URL_Metric_Group_Collection implements Countable, IteratorAggrega
 	 * value of 1, and the breakpoints are used as the maximum viewport widths for the viewport groups, with the addition of
 	 * a final viewport group which has a maximum viewport width of infinity.
 	 *
-	 * This array may be empty in which case there are no responsive breakpoints and all URL Metrics are collected in a
+	 * This array may be empty, in which case there are no responsive breakpoints, and all URL Metrics are collected in a
 	 * single group.
 	 *
 	 * @since 0.1.0
@@ -153,7 +153,7 @@ public function __construct( array $url_metrics, string $current_etag, array $br
 		 */
 		$this->breakpoints = $breakpoints;
 
-		// Set sample size.
+		// Set the sample size.
 		if ( $sample_size <= 0 ) {
 			throw new InvalidArgumentException(
 				esc_html(
@@ -211,7 +211,7 @@ public function get_sample_size(): int {
 	}
 
 	/**
-	 * Gets the freshness age (TTL) for a given URL Metric..
+	 * Gets the freshness age (TTL) for a given URL Metric.
 	 *
 	 * @since 1.0.0
 	 *
@@ -224,7 +224,7 @@ public function get_freshness_ttl(): int {
 	/**
 	 * Gets the first URL Metric group (with the lowest minimum viewport width, e.g. for mobile).
 	 *
-	 * This group normally represents viewports for mobile devices. This group always has a minimum viewport width of 0
+	 * This group normally represents viewports for mobile devices. This group always has a minimum viewport width of 0,
 	 * and the maximum viewport width corresponds to the smallest defined breakpoint returned by
 	 * {@see od_get_breakpoint_max_widths()}.
 	 *
@@ -241,7 +241,7 @@ public function get_first_group(): OD_URL_Metric_Group {
 	 *
 	 * This group normally represents viewports for desktop devices.  This group always has a minimum viewport width
 	 * defined as one greater than the largest breakpoint returned by {@see od_get_breakpoint_max_widths()}.
-	 * The maximum viewport width of this group is always `null`, or in other words it is unbounded.
+	 * The maximum viewport width of this group is always `null`, or in other words, it is unbounded.
 	 *
 	 * @since 0.7.0
 	 *
@@ -404,7 +404,7 @@ public function is_every_group_populated(): bool {
 	/**
 	 * Checks whether every group is complete (full sample of non-stale URL Metrics).
 	 *
-	 * Completeness means the full sample size of URL Metrics has been collected,
+	 * Completeness means the full sample size of URL Metrics has been collected;
 	 * none of the collected URL Metrics are stale (with a mismatching ETag or a
 	 * timestamp older than the freshness TTL).
 	 *
@@ -520,9 +520,9 @@ public function get_common_lcp_element(): ?OD_Element {
 	/**
 	 * Gets all elements from all URL Metrics from all groups keyed by the elements' XPaths.
 	 *
-	 * This is an O(n^3) function so its results must be cached. This being said, the number of groups should be 4 (one
-	 * more than the default number of breakpoints) and the number of URL Metrics for each group should be 3
-	 * (the default sample size). Therefore, given the number (n) of visited elements on the page this will only
+	 * This is an O(n^3) function, so its results must be cached. This being said, the number of groups should be 4 (one
+	 * more than the default number of breakpoints), and the number of URL Metrics for each group should be 3
+	 * (the default sample size). Therefore, given the number (n) of visited elements on the page, this will only
 	 * end up running n*4*3 times.
 	 *
 	 * @since 0.7.0
@@ -584,8 +584,8 @@ public function get_all_element_max_intersection_ratios(): array {
 	 *
 	 * An element is positioned in the initial viewport if its `boundingClientRect.top` is less than the
 	 * `viewport.height` for any of its recorded URL Metrics. Note that even though the element may be positioned in the
-	 * initial viewport, it may not actually be visible. It could be occluded as a latter slide in a carousel in which
-	 * case it will have intersectionRatio of 0. Or the element may not be visible due to it or an ancestor having the
+	 * initial viewport, it may not actually be visible. It could be occluded as a latter slide in a carousel, in which
+	 * case it will have an intersectionRatio of 0. Or the element may not be visible due to it or an ancestor having the
 	 * `visibility:hidden` style, such as in the case of a dropdown navigation menu. When, for example, an IMG element
 	 * is positioned in any initial viewport, it should not get `loading=lazy` but rather `fetchpriority=low`.
 	 * Furthermore, the element may be positioned _above_ the initial viewport or to the left or right of the viewport,
@@ -624,7 +624,7 @@ public function get_all_elements_positioned_in_any_initial_viewport(): array {
 	 * @since 0.3.0
 	 *
 	 * @param string $xpath XPath for the element.
-	 * @return float|null Max intersection ratio of null if tag is unknown (not captured).
+	 * @return float|null Max intersection ratio or null if the tag is unknown (not captured).
 	 */
 	public function get_element_max_intersection_ratio( string $xpath ): ?float {
 		return $this->get_all_element_max_intersection_ratios()[ $xpath ] ?? null;
@@ -636,7 +636,7 @@ public function get_element_max_intersection_ratio( string $xpath ): ?float {
 	 * @since 0.7.0
 	 *
 	 * @param string $xpath XPath for the element.
-	 * @return bool|null Whether element is positioned in any initial viewport of null if unknown.
+	 * @return bool|null Whether an element is positioned in any initial viewport or null if unknown.
 	 */
 	public function is_element_positioned_in_any_initial_viewport( string $xpath ): ?bool {
 		return $this->get_all_elements_positioned_in_any_initial_viewport()[ $xpath ] ?? null;
@@ -651,8 +651,8 @@ public function is_element_positioned_in_any_initial_viewport( string $xpath ):
 	 */
 	public function get_flattened_url_metrics(): array {
 		// The duplication of iterator_to_array is not a mistake. This collection is an
-		// iterator and the collection contains iterator instances. So to flatten the
-		// two levels of iterators we need to nest calls to iterator_to_array().
+		// iterator, and the collection contains iterator instances. So to flatten the
+		// two levels of iterators, we need to nest calls to iterator_to_array().
 		return array_merge(
 			...array_map(
 				'iterator_to_array',

plugins/optimization-detective/class-od-template-optimization-context.php

@@ -268,7 +268,7 @@ static function ( OD_URL_Metric $a, OD_URL_Metric $b ): int {
 	/**
 	 * Determines whether the URL Metric group is complete.
 	 *
-	 * A group is complete if it has the full sample size of URL Metrics
+	 * A group is complete if it has the full sample size of URL Metrics,
 	 * and all of these URL Metrics are fresh (with a current ETag and a
 	 * timestamp that is not older than the freshness TTL).
 	 *
@@ -322,15 +322,15 @@ public function get_lcp_element(): ?OD_Element {
 
 		$result = ( function () {
 
-			// No metrics have been gathered for this group so there is no LCP element.
+			// No metrics have been gathered for this group, so there is no LCP element.
 			if ( count( $this->url_metrics ) === 0 ) {
 				return null;
 			}
 
 			// The following arrays all share array indices.
 
 			/**
-			 * Seen breadcrumbs counts.
+			 * Seen breadcrumb counts.
 			 *
 			 * @var array<int, non-empty-string> $seen_breadcrumbs
 			 */
@@ -350,7 +350,7 @@ public function get_lcp_element(): ?OD_Element {
 			 */
 			$breadcrumb_element = array();
 
-			// Prefer to use URL Metrics which have a current ETag.
+			// Prefer to use URL Metrics, which have a current ETag.
 			$url_metrics = array_filter(
 				$this->url_metrics,
 				function ( OD_URL_Metric $url_metric ): bool {
@@ -459,7 +459,7 @@ public function get_all_element_max_intersection_ratios(): array {
 	 * @since 0.9.0
 	 *
 	 * @param string $xpath XPath for the element.
-	 * @return float|null Max intersection ratio of null if tag is unknown (not captured).
+	 * @return float|null Max intersection ratio or null if the tag is unknown (not captured).
 	 */
 	public function get_element_max_intersection_ratio( string $xpath ): ?float {
 		return $this->get_all_element_max_intersection_ratios()[ $xpath ] ?? null;

plugins/optimization-detective/class-od-url-metric-group-collection.php

@@ -208,7 +208,7 @@ public static function get_json_schema(): array {
 			)
 		);
 
-		// The spec allows these to be negative but this doesn't make sense in the context of intersectionRect and boundingClientRect.
+		// The spec allows these to be negative, but this doesn't make sense in the context of intersectionRect and boundingClientRect.
 		$dom_rect_properties['width']['minimum']  = 0.0;
 		$dom_rect_properties['height']['minimum'] = 0.0;
 
@@ -312,9 +312,9 @@ public static function get_json_schema(): array {
 				),
 			),
 			// Additional root properties may be added to the schema via the od_url_metric_schema_root_additional_properties filter.
-			// Therefore, additionalProperties is set to true so that additional properties defined in the extended schema may persist
+			// Therefore, `additionalProperties` is set to true so that additional properties defined in the extended schema may persist
 			// in a stored URL Metric even when the extension is deactivated. For REST API requests, the OD_Strict_URL_Metric
-			// which sets this to false so that newly-submitted URL Metrics only ever include the known properties.
+			// which sets this to false so that newly submitted URL Metrics only ever include the known properties.
 			'additionalProperties' => true,
 		);
 
@@ -364,7 +364,7 @@ public static function get_json_schema(): array {
 	protected static function extend_schema_with_optional_properties( array $properties_schema, array $additional_properties, string $filter_name ): array {
 		$doing_it_wrong = static function ( string $message ) use ( $filter_name ): void {
 			_doing_it_wrong(
-				esc_html( "Filter: '{$filter_name}'" ),
+				esc_html( "Filter: '$filter_name'" ),
 				esc_html( $message ),
 				'Optimization Detective 0.6.0'
 			);