Merge branch 'release/21.6' into trunk

Author: pls78

package.json

@@ -83,7 +83,7 @@
     "typescript": "^4.2.4"
   },
   "yoast": {
-    "pluginVersion": "21.6-RC2"
+    "pluginVersion": "21.6-RC3"
   },
   "version": "0.0.0"
 }

packages/js/src/components/WincherSEOPerformanceModal.js

@@ -7,8 +7,7 @@ import PropTypes from "prop-types";
 import styled from "styled-components";
 
 /* Yoast dependencies */
-import { colors } from "@yoast/style-guide";
-import { Collapsible } from "@yoast/components";
+import { MetaboxButton } from "./MetaboxButton";
 
 /* Internal dependencies */
 import { ModalContainer } from "./modals/Container";
@@ -25,17 +24,6 @@ const StyledHeroIcon = styled( ChartBarIcon )`
 	margin: 3px;
 `;
 
-const MetaboxModalButton = styled( Collapsible )`
-	h2 > button {
-		padding-left: 24px;
-		padding-top: 16px;
-
-		&:hover {
-			background-color: #f0f0f0;
-		}
-	}
-`;
-
 /**
  * Handles the click event on the "Track SEO performance" button.
  *
@@ -128,18 +116,17 @@ export default function WincherSEOPerformanceModal( props ) {
 			/>
 			}
 
-			{ location === "metabox" && <MetaboxModalButton
-				hasPadding={ false }
-				hasSeparator={ true }
-				suffixIconCollapsed={ {
-					icon: "pencil-square",
-					color: colors.$black,
-					size: "20px",
-				} }
-				id={ `wincher-open-button-${location}` }
-				title={ title }
-				onToggle={ onModalOpen }
-			/> }
+			{ location === "metabox" && (
+				<div className="yst-root">
+					<MetaboxButton
+						id={ `wincher-open-button-${location}` }
+						onClick={ onModalOpen }
+					>
+						<MetaboxButton.Text>{ title }</MetaboxButton.Text>
+						<ChartBarIcon className="yst-h-5 yst-w-5 yst-text-slate-500" { ...svgAriaProps } />
+					</MetaboxButton>
+				</div>
+			) }
 		</Fragment>
 	);
 }

readme.txt

@@ -348,7 +348,7 @@ Release date: 2023-11-28
 
 #### Enhancements
 
-* Improves the _Track SEO performance_ functionality in the Yoast SEO metabox/sidebar.
+* Improves the _Track SEO performance_ functionality by adding a graph that plots keyphrase trends over time.
 
 #### Bugfixes
 

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.6-RC2' );
+define( 'WPSEO_VERSION', '21.6-RC3' );
 
 
 if ( ! defined( 'WPSEO_PATH' ) ) {

wp-seo.php

@@ -8,7 +8,7 @@
  *
  * @wordpress-plugin
  * Plugin Name: Yoast SEO
- * Version:     21.6-RC2
+ * Version:     21.6-RC3
  * 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