Merge branch 'trunk' of github.com:Yoast/wordpress-seo into 280-remov…

…e-new-dashboard-feature-flag

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

package.json

@@ -75,7 +75,7 @@
     "webpack-bundle-analyzer": "^4.9.1"
   },
   "yoast": {
-    "pluginVersion": "23.6-RC6"
+    "pluginVersion": "23.7-RC1"
   },
   "version": "0.0.0"
 }

packages/js/src/general/components/sidebar-recommendations.js

@@ -1,4 +1,4 @@
-import { AcademyUpsellCard, PremiumUpsellCard, RecommendationsSidebar } from "../../shared-admin/components";
+import { AcademyUpsellCard, PremiumUpsellCard } from "../../shared-admin/components";
 import { useSelectDashboard } from "../hooks";
 /**
  * @returns {JSX.Element} The sidebar recommendations.
@@ -14,10 +14,14 @@ const SidebarRecommendations = () => {
 	}
 
 	return (
-		<RecommendationsSidebar>
-			<PremiumUpsellCard link={ premiumLink } linkProps={ premiumUpsellConfig } promotions={ promotions } />
-			<AcademyUpsellCard link={ academyLink } />
-		</RecommendationsSidebar>
+		<div className="yst-min-w-[16rem] xl:yst-max-w-[16rem]">
+			<div className="yst-sticky yst-top-16">
+				<div className="yst-grid yst-grid-cols-1 sm:yst-grid-cols-2 min-[783px]:yst-grid-cols-1 lg:yst-grid-cols-2 xl:yst-grid-cols-1 yst-gap-4">
+					<PremiumUpsellCard link={ premiumLink } linkProps={ premiumUpsellConfig } promotions={ promotions } />
+					<AcademyUpsellCard link={ academyLink } />
+				</div>
+			</div>
+		</div>
 	);
 };
 

packages/js/src/general/routes/alert-center.js

@@ -4,7 +4,7 @@ import { PremiumUpsellList } from "../../shared-admin/components/premium-upsell-
 import { Notifications, Problems } from "../components";
 import SidebarRecommendations from "../components/sidebar-recommendations";
 import { useSelectDashboard } from "../hooks";
-import classNames from "classnames";
+
 /**
  * @returns {JSX.Element} The dashboard content placeholder.
  */
@@ -13,10 +13,11 @@ export const AlertCenter = () => {
 	const premiumLink = useSelectDashboard( "selectLink", [], "https://yoa.st/17h" );
 	const premiumUpsellConfig = useSelectDashboard( "selectUpsellSettingsAsProps" );
 	const promotions = useSelectDashboard( "selectPreference", [], "promotions", [] );
-	return <>
-		<div className={ classNames( {  "yst-flex yst-flex-wrap xl:yst-pr-[17.5rem]": ! isPremium } ) }>
+	return <div className="yst-flex yst-gap-8 xl:yst-flex-row yst-flex-col">
+		 { /* Alert center */ }
+		<div className="yst-flex yst-flex-wrap yst-flex-grow xl:yst-flex-row yst-flex-col">
 			<Paper className="yst-grow">
-				<header className="yst-p-8 yst-border-b yst-border-slate-200">
+				<header className="yst-p-8">
 					<div className="yst-max-w-screen-sm">
 						<Title>{ __( "Alert center", "wordpress-seo" ) }</Title>
 						<p className="yst-text-tiny yst-mt-3">
@@ -25,16 +26,19 @@ export const AlertCenter = () => {
 					</div>
 				</header>
 			</Paper>
-			<div className="yst-grid lg:yst-grid-cols-2 yst-gap-8 yst-my-8 yst-grow">
-				<Problems />
-				<Notifications />
+			<div className="yst-basis-full">
+				<div className="yst-grid lg:yst-grid-cols-2 yst-gap-8 yst-my-8 yst-grow yst-items-start">
+					<Problems />
+					<Notifications />
+				</div>
 				{ ! isPremium && <PremiumUpsellList
 					premiumLink={ premiumLink }
 					premiumUpsellConfig={ premiumUpsellConfig }
 					promotions={ promotions }
 				/> }
 			</div>
-			<SidebarRecommendations />
 		</div>
-	</>;
+		{ /* Sidebar Recommendations */ }
+		<SidebarRecommendations />
+	</div>;
 };

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.6
-Stable tag: 23.5
+Stable tag: 23.6
 Requires PHP: 7.2.5
 
 Improve your WordPress SEO: Write better content and have a fully optimized WordPress site using the Yoast SEO plugin.
@@ -274,6 +274,24 @@ Your question has most likely been answered on our help center: [yoast.com/help/
 
 == Changelog ==
 
+= 23.7 =
+
+Release date: 2024-10-22
+
+#### Enhancements
+
+* Removes the _keyphrase in slug_ assessment for static home pages.
+
+#### Bugfixes
+
+* Fixes a bug where a database error would occur when there were no public taxonomies available for indexing.
+* Fixes a bug where another plugin running the `exit()` function inside the `plugin_loaded` hook would result in a fatal error. Props to @menno-ll.
+
+#### Other
+
+* Removes translation strings that are not meant for the Yoast SEO Free version from the plugin.
+* Resets the notice for search engines discouraged when changing Search engine visibility to visible.
+
 = 23.6 =
 
 Release date: 2024-10-08
@@ -296,20 +314,5 @@ Yoast SEO 23.6 brings more enhancements and bugfixes. [Find more information abo
 
 * Sets the minimum supported WordPress version to 6.5.
 
-= 23.5 =
-
-Release date: 2024-09-24
-
-Yoast SEO 23.5 brings more enhancements and bugfixes. [Find more information about our software releases and updates here](https://yoa.st/release-24-9-24).
-
-#### Enhancements
-
-* Improves analysis score feedback labels in the publish sections.
-* Improves our integration with cache plugins by preventing flushing their cache when not needed.
-
-#### Bugfixes
-
-* Fixes a bug where Arabic keyphrases containing certain function words were not correctly matched.
-
 = Earlier versions =
 For the changelog of earlier versions, please refer to [the changelog on yoast.com](https://yoa.st/yoast-seo-changelog).

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', '23.6-RC6' );
+define( 'WPSEO_VERSION', '23.7-RC1' );
 
 
 if ( ! defined( 'WPSEO_PATH' ) ) {

wp-seo.php

@@ -8,7 +8,7 @@
  *
  * @wordpress-plugin
  * Plugin Name: Yoast SEO
- * Version:     23.6-RC6
+ * Version:     23.7-RC1
  * 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