Merge branch 'trunk' into add/site-health-check-for-od-rest-api

Author: b1ink0

.github/workflows/deploy-plugins.yml

@@ -69,9 +69,6 @@ jobs:
       - name: Install npm dependencies
         run: npm ci
 
-      - name: Check plugin versions
-        run: npm run versions -- --plugin=${{ matrix.plugin }}
-
       - name: Build plugin
         run: npm run build:plugin:${{ matrix.plugin }}
 
@@ -101,6 +98,10 @@ jobs:
 
           echo "deploy=true" >> $GITHUB_OUTPUT
 
+      - name: Check plugin version integrity
+        if: steps.check-deployment.outputs.deploy == 'true'
+        run: npm run versions -- --plugin=${{ matrix.plugin }}
+
       - name: Create zip file
         if: steps.check-deployment.outputs.deploy == 'true'
         run: |

plugins/embed-optimizer/hooks.php

@@ -121,7 +121,7 @@ function embed_optimizer_filter_extension_module_urls( $extension_module_urls ):
 	if ( ! is_array( $extension_module_urls ) ) {
 		$extension_module_urls = array();
 	}
-	$extension_module_urls[] = add_query_arg( 'ver', EMBED_OPTIMIZER_VERSION, plugin_dir_url( __FILE__ ) . embed_optimizer_get_asset_path( 'detect.js' ) );
+	$extension_module_urls[] = plugins_url( add_query_arg( 'ver', EMBED_OPTIMIZER_VERSION, embed_optimizer_get_asset_path( 'detect.js' ) ), __FILE__ );
 	return $extension_module_urls;
 }
 

plugins/image-prioritizer/detect.js

@@ -43,18 +43,6 @@ function log( ...message ) {
 	console.log( consoleLogPrefix, ...message );
 }
 
-/**
- * Logs a warning.
- *
- * @since 0.3.0
- *
- * @param {...*} message
- */
-function warn( ...message ) {
-	// eslint-disable-next-line no-console
-	console.warn( consoleLogPrefix, ...message );
-}
-
 /**
  * Initializes extension.
  *
@@ -77,27 +65,6 @@ export async function initialize( { isDebug, onLCP } ) {
 	);
 }
 
-/**
- * Gets the performance resource entry for a given URL.
- *
- * @since 0.3.0
- *
- * @param {string} url - Resource URL.
- * @return {PerformanceResourceTiming|null} Resource entry or null.
- */
-function getPerformanceResourceByURL( url ) {
-	const entries =
-		/** @type PerformanceResourceTiming[] */ performance.getEntriesByType(
-			'resource'
-		);
-	for ( const entry of entries ) {
-		if ( entry.name === url ) {
-			return entry;
-		}
-	}
-	return null;
-}
-
 /**
  * Handles a new LCP metric being reported.
  *
@@ -129,21 +96,6 @@ function handleLCPMetric( metric, isDebug ) {
 			continue;
 		}
 
-		// Now only consider proceeding with the URL if its loading was initiated with stylesheet or preload link.
-		const resourceEntry = getPerformanceResourceByURL( entry.url );
-		if (
-			! resourceEntry ||
-			! [ 'css', 'link' ].includes( resourceEntry.initiatorType )
-		) {
-			if ( isDebug ) {
-				warn(
-					`Skipped considering URL (${ entry.url }) due to unexpected performance resource timing entry:`,
-					resourceEntry
-				);
-			}
-			return;
-		}
-
 		// Skip URLs that are excessively long. This is the maxLength defined in image_prioritizer_add_element_item_schema_properties().
 		if ( entry.url.length > 500 ) {
 			if ( isDebug ) {

plugins/image-prioritizer/helper.php

@@ -93,7 +93,7 @@ function image_prioritizer_filter_extension_module_urls( $extension_module_urls
 	if ( ! is_array( $extension_module_urls ) ) {
 		$extension_module_urls = array();
 	}
-	$extension_module_urls[] = add_query_arg( 'ver', IMAGE_PRIORITIZER_VERSION, plugin_dir_url( __FILE__ ) . image_prioritizer_get_asset_path( 'detect.js' ) );
+	$extension_module_urls[] = plugins_url( add_query_arg( 'ver', IMAGE_PRIORITIZER_VERSION, image_prioritizer_get_asset_path( 'detect.js' ) ), __FILE__ );
 	return $extension_module_urls;
 }
 

plugins/optimization-detective/detection.php

@@ -71,7 +71,7 @@ function od_get_cache_purge_post_id(): ?int {
  */
 function od_get_detection_script( string $slug, OD_URL_Metric_Group_Collection $group_collection ): string {
 	$web_vitals_lib_data = require __DIR__ . '/build/web-vitals.asset.php';
-	$web_vitals_lib_src  = add_query_arg( 'ver', $web_vitals_lib_data['version'], plugin_dir_url( __FILE__ ) . 'build/web-vitals.js' );
+	$web_vitals_lib_src  = plugins_url( add_query_arg( 'ver', $web_vitals_lib_data['version'], 'build/web-vitals.js' ), __FILE__ );
 
 	/**
 	 * Filters the list of extension script module URLs to import when performing detection.
@@ -118,7 +118,7 @@ static function ( OD_URL_Metric_Group $group ): array {
 	return wp_get_inline_script_tag(
 		sprintf(
 			'import detect from %s; detect( %s );',
-			wp_json_encode( add_query_arg( 'ver', OPTIMIZATION_DETECTIVE_VERSION, plugin_dir_url( __FILE__ ) . od_get_asset_path( 'detect.js' ) ) ),
+			wp_json_encode( plugins_url( add_query_arg( 'ver', OPTIMIZATION_DETECTIVE_VERSION, od_get_asset_path( 'detect.js' ) ), __FILE__ ) ),
 			wp_json_encode( $detect_args )
 		),
 		array( 'type' => 'module' )

plugins/optimization-detective/readme.txt

@@ -257,7 +257,7 @@ For example:
 add_filter(
 	'od_extension_module_urls',
 	static function ( array $extension_module_urls ): array {
-		$extension_module_urls[] = add_query_arg( 'ver', '1.0', plugin_dir_url( __FILE__ ) . 'detect.js' );
+		$extension_module_urls[] = plugins_url( add_query_arg( 'ver', '1.0', 'detect.js' ), __FILE__ );
 		return $extension_module_urls;
 	}
 );

plugins/performance-lab/includes/admin/load.php

@@ -264,7 +264,7 @@ function perflab_enqueue_features_page_scripts(): void {
 	// Enqueue plugin activate AJAX script and localize script data.
 	wp_enqueue_script(
 		'perflab-plugin-activate-ajax',
-		plugin_dir_url( PERFLAB_MAIN_FILE ) . perflab_get_asset_path( 'includes/admin/plugin-activate-ajax.js' ),
+		plugins_url( perflab_get_asset_path( 'includes/admin/plugin-activate-ajax.js' ), PERFLAB_MAIN_FILE ),
 		array( 'wp-i18n', 'wp-a11y', 'wp-api-fetch' ),
 		PERFLAB_VERSION,
 		true

plugins/web-worker-offloading/helper.php

@@ -23,7 +23,7 @@ function plwwo_get_configuration(): array {
 	$config = array(
 		// The source code in the build directory is compiled from <https://github.com/BuilderIO/partytown/tree/main/src/lib>.
 		// See webpack config in the WordPress/performance repo: <https://github.com/WordPress/performance/blob/282a068f3eb2575d37aeb9034e894e7140fcddca/webpack.config.js#L84-L130>.
-		'lib' => wp_parse_url( plugin_dir_url( __FILE__ ), PHP_URL_PATH ) . 'build/',
+		'lib' => wp_parse_url( plugins_url( 'build/', __FILE__ ), PHP_URL_PATH ),
 	);
 
 	if ( WP_DEBUG && SCRIPT_DEBUG ) {