Merge branch 'main' of https://github.com/Yoast/wordpress-seo into trunk

package.json

@@ -83,7 +83,7 @@
     "typescript": "^4.2.4"
   },
   "yoast": {
-    "pluginVersion": "21.7-RC1"
+    "pluginVersion": "21.7"
   },
   "version": "0.0.0"
 }

readme.txt

@@ -5,7 +5,7 @@ License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl.html
 Tags: SEO, XML sitemap, Content analysis, Readability, Schema
 Tested up to: 6.4
-Stable tag: 21.6
+Stable tag: 21.7
 Requires PHP: 7.2.5
 
 Improve your WordPress SEO: Write better content and have a fully optimized WordPress site using the Yoast SEO plugin.
@@ -211,7 +211,7 @@ Take your WordPress SEO to new heights with these powerful Yoast SEO add-ons:
 
 * [Yoast News SEO](https://yoa.st/1uv): Amplify your visibility and performance in Google News, allowing your news website to reach a broader audience.
 
-* [Yoast WooCommerce SEO](https://yoa.st/3rh): Enhance your online shop's discoverability with extra tools and functionality designed specifically for online stores, helping you drive more targeted traffic and dominate the search results for your products. Comes with generative AI tools to help you write great titles and meta descriptions for your products!
+* [Yoast WooCommerce SEO](https://yoa.st/3rh): Enhance your online shop's discoverability with extra tools and functionality designed specifically for online stores, helping you drive more targeted traffic and dominate the search results for your products. Comes with generative AI tools to help you write great titles and meta descriptions for your products! Also, use WooCommerce SEO to easily import and export global identifiers like GTIN8, UPC, and ISBN for your products.
 
 ### BUG REPORTS
 
@@ -346,24 +346,26 @@ Your question has most likely been answered on our help center: [yoast.com/help/
 
 Release date: 2023-12-12
 
+Yoast SEO 21.7 is out now. In this release, we bring an improved first-time configuration, making it easier for people to get started. Also, we fixed several bugs and added some enhancements. Find out more about what's new in Yoast SEO 21.7 in [our release post](https://yoa.st/release-12-12-23)!
+
 #### Enhancements
 
 * Removes a superfluous warning in the first time configuration when the site environment is non-production.
 
 #### Bugfixes
 
-* Fixes a bug where an additional `Organization, Person` schema piece is wrongly generated for author pages in case a website representing an organization was previously set to represent a person different than the author.
-* Fixes a bug where initial state for site name would be empty when saving site representation step in first time configuration.
+* Fixes a bug where an additional `Organization, Person` schema piece would be wrongly generated for author pages when a website representing an organization was set to represent a person different from the author.
+* Fixes a bug where the initial state for the website name would be empty when saving the site representation step in the first time configuration.
 * Fixes a bug where modifications to the analysis data would not be included in the Insights analysis.
-* Fixes a bug where the \"view\" button for tracking SEO performance would have the wrong size when editing a post in Elementor and Classic editor.
+* Fixes a bug where the "view" button for tracking SEO performance would have the wrong size when editing a post in Elementor and Classic editor.
 
 #### Other
 
-* Adds linting and testing to ensure that the plugin has no known incompatibilities with PHP 8.3.
+* Adds checks to ensure that the plugin has no known incompatibilities with PHP 8.3.
 * Improves the discoverability of the security policy.
-* Improves the indication given to the users in the first-time configuration.
+* Improves the instructions in the first-time configuration so that they're easier to follow.
 * Improves the new installation screen layout and design.
-* Provides a filter to add a list of shortcodes to be parsed and thus included in our content analysis in Classic editor.
+* Provides a filter to add a list of shortcodes so they can be parsed and then included in our content analysis in Classic editor.
 
 = 21.6 =
 

tests/Unit/bootstrap.php

@@ -40,7 +40,7 @@
 \define( 'YOAST_VENDOR_PREFIX_DIRECTORY', 'vendor_prefixed' );
 
 \define( 'YOAST_SEO_PHP_REQUIRED', '7.2.5' );
-\define( 'YOAST_SEO_WP_TESTED', '6.4.1' );
+\define( 'YOAST_SEO_WP_TESTED', '6.4.2' );
 \define( 'YOAST_SEO_WP_REQUIRED', '6.2' );
 
 if ( ! \defined( 'WPSEO_NAMESPACES' ) ) {

wp-seo-main.php

@@ -15,7 +15,7 @@
  * {@internal Nobody should be able to overrule the real version number as this can cause
  *            serious issues with the options, so no if ( ! defined() ).}}
  */
-define( 'WPSEO_VERSION', '21.7-RC1' );
+define( 'WPSEO_VERSION', '21.7' );
 
 
 if ( ! defined( 'WPSEO_PATH' ) ) {
@@ -35,7 +35,7 @@
 define( 'YOAST_VENDOR_PREFIX_DIRECTORY', 'vendor_prefixed' );
 
 define( 'YOAST_SEO_PHP_REQUIRED', '7.2.5' );
-define( 'YOAST_SEO_WP_TESTED', '6.4.1' );
+define( 'YOAST_SEO_WP_TESTED', '6.4.2' );
 define( 'YOAST_SEO_WP_REQUIRED', '6.2' );
 
 if ( ! defined( 'WPSEO_NAMESPACES' ) ) {

wp-seo.php

@@ -8,7 +8,7 @@
  *
  * @wordpress-plugin
  * Plugin Name: Yoast SEO
- * Version:     21.7-RC1
+ * Version:     21.7
  * Plugin URI:  https://yoa.st/1uj
  * Description: The first true all-in-one SEO solution for WordPress, including on-page content analysis, XML sitemaps and much more.
  * Author:      Team Yoast