Merge branch 'trunk' into update/editorconfig-json-add-newline

WordPress · Mar 7, 2024 · 5682484 · 5682484
2 parents 641f094 + ca48fb7
commit 5682484
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 15 deletions.
diff --git a/.wp-env.json b/.wp-env.json
@@ -1,6 +1,12 @@
 {
   "core": null,
-  "plugins": [ "." ],
+  "plugins": [
+    ".",
+    "./plugins/auto-sizes",
+    "./plugins/dominant-color-images",
+    "./plugins/speculation-rules",
+    "./plugins/webp-uploads"
+  ],
   "env": {
     "tests": {
       "config": {

diff --git a/plugins/auto-sizes/auto-sizes.php b/plugins/auto-sizes/auto-sizes.php
@@ -5,7 +5,7 @@
  * Description: This plugin implements the HTML spec for adding `sizes="auto"` to lazy-loaded images.
  * Requires at least: 6.3
  * Requires PHP: 7.0
- * Version: 1.0.0
+ * Version: 1.0.1
  * Author: WordPress Performance Team
  * Author URI: https://make.wordpress.org/performance/
  * License: GPLv2 or later
@@ -25,6 +25,6 @@
 	return;
 }
 
-define( 'IMAGE_AUTO_SIZES_VERSION', '1.0.0' );
+define( 'IMAGE_AUTO_SIZES_VERSION', '1.0.1' );
 
 require_once __DIR__ . '/hooks.php';
diff --git a/plugins/auto-sizes/readme.txt b/plugins/auto-sizes/readme.txt
@@ -2,9 +2,9 @@
 
 Contributors:      wordpressdotorg
 Requires at least: 6.4
-Tested up to:      6.4
+Tested up to:      6.5
 Requires PHP:      7.0
-Stable tag:        1.0.0
+Stable tag:        1.0.1
 License:           GPLv2 or later
 License URI:       https://www.gnu.org/licenses/gpl-2.0.html
 Tags:              performance, images, auto-sizes
@@ -48,6 +48,10 @@ Contributions are always welcome! Learn more about how to get involved in the [C
 
 == Changelog ==
 
+= 1.0.1 =
+
+* Update tested WordPress version to 6.5. ([1027](https://github.com/WordPress/performance/pull/1027))
+
 = 1.0.0 =
 
 * Initial release of the Auto-sizes for Lazy-loaded Images plugin as a standalone plugin. ([904](https://github.com/WordPress/performance/pull/904))
diff --git a/plugins/dominant-color-images/load.php b/plugins/dominant-color-images/load.php
@@ -5,7 +5,7 @@
  * Description: Adds support to store the dominant color of newly uploaded images and create a placeholder background of that color.
  * Requires at least: 6.3
  * Requires PHP: 7.0
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author: WordPress Performance Team
  * Author URI: https://make.wordpress.org/performance/
  * License: GPLv2 or later
@@ -25,7 +25,7 @@
 	return;
 }
 
-define( 'DOMINANT_COLOR_IMAGES_VERSION', '1.0.1' );
+define( 'DOMINANT_COLOR_IMAGES_VERSION', '1.0.2' );
 
 require_once __DIR__ . '/helper.php';
 require_once __DIR__ . '/hooks.php';
diff --git a/plugins/dominant-color-images/readme.txt b/plugins/dominant-color-images/readme.txt
@@ -2,9 +2,9 @@
 
 Contributors:      wordpressdotorg
 Requires at least: 6.3
-Tested up to:      6.3
+Tested up to:      6.5
 Requires PHP:      7.0
-Stable tag:        1.0.1
+Stable tag:        1.0.2
 License:           GPLv2 or later
 License URI:       https://www.gnu.org/licenses/gpl-2.0.html
 Tags:              performance, images, dominant color
@@ -47,6 +47,10 @@ Contributions are always welcome! Learn more about how to get involved in the [C
 
 == Changelog ==
 
+= 1.0.2 =
+
+* Update tested WordPress version to 6.5. ([1027](https://github.com/WordPress/performance/pull/1027))
+
 = 1.0.1 =
 
 * Exclude ".wordpress-org" directory when deploying standalone plugins. ([866](https://github.com/WordPress/performance/pull/866))

diff --git a/plugins/speculation-rules/readme.txt b/plugins/speculation-rules/readme.txt
@@ -2,7 +2,7 @@
 
 Contributors:      wordpressdotorg
 Requires at least: 6.3
-Tested up to:      6.4
+Tested up to:      6.5
 Requires PHP:      7.0
 Stable tag:        1.1.0
 License:           GPLv2 or later
@@ -103,6 +103,7 @@ Contributions are always welcome! Learn more about how to get involved in the [C
 = 1.1.0 =
 
 * Allow excluding URL patterns from prerendering or prefetching specifically. ([1025](https://github.com/WordPress/performance/pull/1025))
+* Update tested WordPress version to 6.5. ([1027](https://github.com/WordPress/performance/pull/1027))
 
 = 1.0.1 =
 

diff --git a/plugins/webp-uploads/hooks.php b/plugins/webp-uploads/hooks.php
@@ -777,3 +777,24 @@ function webp_uploads_render_generator() {
 	}
 }
 add_action( 'wp_head', 'webp_uploads_render_generator' );
+
+/**
+ * Adds a settings link to the plugin's action links.
+ *
+ * @since 1.0.6
+ *
+ * @param array $links An array of plugin action links.
+ * @return array The modified list of actions.
+ */
+function webp_uploads_settings_link( $links ) {
+	if ( ! is_array( $links ) ) {
+		return $links;
+	}
+	$links[] = sprintf(
+		'<a href="%1$s">%2$s</a>',
+		esc_url( admin_url( 'options-media.php#perflab_generate_webp_and_jpeg' ) ),
+		esc_html__( 'Settings', 'webp-uploads' )
+	);
+	return $links;
+}
+add_filter( 'plugin_action_links_' . WEBP_UPLOADS_MAIN_FILE, 'webp_uploads_settings_link' );
diff --git a/plugins/webp-uploads/load.php b/plugins/webp-uploads/load.php
@@ -5,7 +5,7 @@
  * Description: Creates WebP versions for new JPEG image uploads if supported by the server.
  * Requires at least: 6.3
  * Requires PHP: 7.0
- * Version: 1.0.5
+ * Version: 1.0.6
  * Author: WordPress Performance Team
  * Author URI: https://make.wordpress.org/performance/
  * License: GPLv2 or later
@@ -25,7 +25,8 @@
 	return;
 }
 
-define( 'WEBP_UPLOADS_VERSION', '1.0.5' );
+define( 'WEBP_UPLOADS_VERSION', '1.0.6' );
+define( 'WEBP_UPLOADS_MAIN_FILE', plugin_basename( __FILE__ ) );
 
 require_once __DIR__ . '/helper.php';
 require_once __DIR__ . '/rest-api.php';

diff --git a/plugins/webp-uploads/readme.txt b/plugins/webp-uploads/readme.txt
@@ -2,9 +2,9 @@
 
 Contributors:      wordpressdotorg
 Requires at least: 6.3
-Tested up to:      6.3
+Tested up to:      6.5
 Requires PHP:      7.0
-Stable tag:        1.0.5
+Stable tag:        1.0.6
 License:           GPLv2 or later
 License URI:       https://www.gnu.org/licenses/gpl-2.0.html
 Tags:              performance, images, webp
@@ -58,6 +58,10 @@ By default, the WebP Uploads plugin will only generate WebP versions of the imag
 
 == Changelog ==
 
+= 1.0.6 =
+
+* Update tested WordPress version to 6.5. ([1027](https://github.com/WordPress/performance/pull/1027))
+
 = 1.0.5 =
 
 * Exclude ".wordpress-org" directory when deploying standalone plugins. ([866](https://github.com/WordPress/performance/pull/866))

diff --git a/readme.txt b/readme.txt
@@ -2,7 +2,7 @@
 
 Contributors:      wordpressdotorg
 Requires at least: 6.3
-Tested up to:      6.4
+Tested up to:      6.5
 Requires PHP:      7.0
 Stable tag:        2.9.0
 License:           GPLv2 or later
@@ -466,6 +466,10 @@ By default, the WebP Uploads module will only generate WebP versions of the imag
 
 == Upgrade Notice ==
 
+= 3.0.0 =
+
+Starting with this release, modules such as Dominant Color Images and WebP Uploads are only available as standalone plugins as opposed to bundled modules. After updating, you will be able to easily migrate to this new structure.
+
 = 2.5.0 =
 
 The SQLite module is no longer present starting with this release. If you still use it, please migrate to the standalone plugin before updating.