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

…ron-indexation-verification

# Conflicts:
#	inc/options/class-wpseo-option-wpseo.php
#	src/integrations/settings-integration.php

.github/PULL_REQUEST_TEMPLATE.md

@@ -83,14 +83,16 @@ This PR affects the following parts of the plugin, which may require extra testi
 ## Quality assurance
 
 * [ ] I have tested this code to the best of my abilities.
-* [ ] During testing, I had activated all plugins Yoast SEO provides integrations for.
+* [ ] During testing, I had activated [all plugins that Yoast SEO provides integrations for](https://github.com/Yoast/wordpress-seo/blob/trunk/readme.txt#L106).
 * [ ] I have added unit tests to verify the code works as intended.
 * [ ] If any part of the code is behind a feature flag, my test instructions also cover cases where the feature flag is switched off.
 * [ ] I have written this PR in accordance with my team's definition of done.
+* [ ] I have checked that the base branch is correctly set.
 
 ## Innovation
 
 * [ ] No innovation project is applicable for this PR.
-* [ ] This PR falls under an innovation project. I have attached the `innovation` label and noted the work hours.
+* [ ] This PR falls under an innovation project. I have attached the `innovation` label.
+* [ ] I have added my hours to [the WBSO document](http://yoa.st/wbso).
 
 Fixes #

Gruntfile.js

@@ -139,13 +139,6 @@ module.exports = function( grunt ) {
  postcss: "@lodder/grunt-postcss",
  "update-version": "@yoast/grunt-plugin-tasks",
  "set-version": "@yoast/grunt-plugin-tasks",
- "update-changelog-with-latest-pr-texts": "@yoast/grunt-plugin-tasks",
- "get-latest-pr-texts": "@yoast/grunt-plugin-tasks",
- "update-changelog": "@yoast/grunt-plugin-tasks",
- "build-qa-changelog": "@yoast/grunt-plugin-tasks",
- "download-qa-changelog": "@yoast/grunt-plugin-tasks",
- "extract-extra-pr-texts-from-yoast-cli-md": "@yoast/grunt-plugin-tasks",
- "update-package-changelog": "@yoast/grunt-plugin-tasks",
  "update-changelog-to-latest": "@yoast/grunt-plugin-tasks",
  "register-prompt": "grunt-prompt",
  "notify-slack": "notify-slack",

admin/class-gutenberg-compatibility.php

@@ -15,14 +15,14 @@ class WPSEO_Gutenberg_Compatibility {
  *
  * @var string
  */
- const CURRENT_RELEASE = '16.0.0';
+ const CURRENT_RELEASE = '16.1.0';
 
  /**
  * The minimally supported version of Gutenberg by the plugin.
  *
  * @var string
  */
- const MINIMUM_SUPPORTED = '16.0.0';
+ const MINIMUM_SUPPORTED = '16.1.0';
 
  /**
  * Holds the current version.

config/grunt/task-config/aliases.yaml

@@ -125,24 +125,6 @@ release:
  - 'artifact'
  - 'wp_deploy:trunk'
 
-'update-changelog:file':
- - 'get-latest-pr-texts'
- - 'update-changelog-with-latest-pr-texts'
- - 'extract-extra-pr-texts-from-yoast-cli-md'
- - 'update-package-changelog'
-'update-changelog:qa':
- - 'get-latest-pr-texts'
- - 'download-qa-changelog'
- - 'build-qa-changelog'
-
-'update-changelog:all':
- - 'get-latest-pr-texts'
- - 'update-changelog-with-latest-pr-texts'
- - 'download-qa-changelog'
- - 'build-qa-changelog'
- - 'extract-extra-pr-texts-from-yoast-cli-md'
- - 'update-package-changelog'
-
 # Default task
 default:
  - 'build'

inc/class-post-type.php

@@ -99,22 +99,32 @@ public static function has_metabox_enabled( $post_type ) {
  return WPSEO_Options::get( 'display-metabox-pt-' . $post_type, false );
  }
 
+ /* ********************* DEPRECATED METHODS ********************* */
+
  /**
  * Removes the notification related to the post types which have been made public.
  *
+ * @deprecated 20.10
+ * @codeCoverageIgnore
+ *
  * @return void
  */
  public static function remove_post_types_made_public_notification() {
+ _deprecated_function( __METHOD__, 'Yoast SEO 20.10', 'Content_Type_Visibility_Dismiss_Notifications::dismiss_notifications' );
  $notification_center = Yoast_Notification_Center::get();
  $notification_center->remove_notification_by_id( 'post-types-made-public' );
  }
 
  /**
  * Removes the notification related to the taxonomies which have been made public.
  *
+ * @deprecated 20.10
+ * @codeCoverageIgnore
+ *
  * @return void
  */
  public static function remove_taxonomies_made_public_notification() {
+ _deprecated_function( __METHOD__, 'Yoast SEO 20.10', 'Content_Type_Visibility_Dismiss_Notifications::dismiss_notifications' );
  $notification_center = Yoast_Notification_Center::get();
  $notification_center->remove_notification_by_id( 'taxonomies-made-public' );
  }

inc/options/class-wpseo-option-wpseo.php

@@ -141,11 +141,13 @@ class WPSEO_Option_Wpseo extends WPSEO_Option {
  'last_known_public_post_types' => [],
  'last_known_public_taxonomies' => [],
  'last_known_no_unindexed' => [],
+ 'new_post_types' => [],
+ 'new_taxonomies' => [],
+ 'show_new_content_type_notification' => false,
  'cron_verify_current_action' => 'term',
  'cron_verify_post_indexables_last_batch' => 0,
  'cron_verify_non_timestamped_indexables_last_batch' => 0,
  'plugin_deactivated_at' => false,
-
  ];
 
  /**
@@ -422,6 +424,8 @@ protected function validate_option( $dirty, $clean, $old ) {
  case 'indexables_page_reading_list':
  case 'last_known_public_post_types':
  case 'last_known_public_taxonomies':
+ case 'new_post_types':
+ case 'new_taxonomies':
  $clean[ $key ] = $old[ $key ];
 
  if ( isset( $dirty[ $key ] ) ) {
@@ -521,6 +525,7 @@ protected function validate_option( $dirty, $clean, $old ) {
  * 'deny_adsbot_crawling'
  * 'redirect_search_pretty_urls'
  * 'should_redirect_after_install_free'
+ * 'show_new_content_type_notification'
  * and most of the feature variables.
  */
  default:

package.json

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

packages/js/src/components/WebinarPromoNotification.js

@@ -1,4 +1,4 @@
-import { __, sprintf } from "@wordpress/i18n";
+import { __ } from "@wordpress/i18n";
 import { useSelect } from "@wordpress/data";
 import PropTypes from "prop-types";
 
@@ -25,22 +25,14 @@ const WebinarPromoNotification = ( {
  alertKey="webinar-promo-notification"
  store={ store }
  id="webinar-promo-notification"
- title={ sprintf(
- /* translators: 1: Yoast SEO. */
- __( "Get the most out of %1$s", "wordpress-seo" ),
- "Yoast SEO"
- ) }
+ title={ __( "Join our FREE webinar for SEO success", "wordpress-seo" ) }
  image={ Image }
  url={ url }
  { ...props }
  >
- { sprintf(
- /* translators: 1: Yoast SEO. */
- __( "Learn how to improve your rankings with %1$s. Ask your questions to our SEO experts during the free live Q&A.", "wordpress-seo" ),
- "Yoast SEO"
- ) }
+ { __( "Feeling lost when it comes to optimizing your site for the search engines? Join our FREE webinar to gain the confidence that you need in order to start optimizing like a pro! You'll obtain the knowledge and tools to start effectively implementing SEO.", "wordpress-seo" ) }
  &nbsp;<a href={ url } target="_blank" rel="noreferrer">
- { __( "Register now!", "wordpress-seo" ) }
+ { __( "Sign up today!", "wordpress-seo" ) }
  </a>
  </PersistentDismissableNotification>
  );

packages/js/src/first-time-configuration/tailwind-components/steps/finish/finish-step.js

@@ -1,5 +1,5 @@
 import { ArrowNarrowRightIcon } from "@heroicons/react/outline";
-import { __ } from "@wordpress/i18n";
+import { __, sprintf } from "@wordpress/i18n";
 import { get } from "lodash";
 import { ReactComponent as ConfigurationFinishImage } from "../../../../../images/indexables_2_left_bubble_optm.svg";
 import { Button, Link } from "@yoast/ui-library";
@@ -25,18 +25,26 @@ export default function FinishStep() {
  <div className="yst-flex yst-flex-row yst-justify-between yst-items-center yst--mt-4">
  <div className="yst-mr-6">
  <p className="yst-text-sm yst-mb-4">
- { __( "That's it! By providing this information, our Indexables squad has been able to do a lot of optimization for your site already. But there's more to do!", "wordpress-seo" ) }
+ { sprintf(
+ /* translators: 1: Yoast. */
+ __( "Good job! By providing this information, %1$s has improved your site and told search engines what your site is all about.", "wordpress-seo" ),
+ "Yoast"
+ ) }
  </p>
  <p className="yst-text-sm yst-mb-6">
- { __( "Learn how to get the most out of Yoast SEO in an easy-to-follow video, ask questions in the live Q&A with our experts, or sign up for Yoast Academy for free to take control of your SEO!", "wordpress-seo" ) }
+ { __( "To increase your rankings, you need to regularly work on SEO. That can be overwhelming, so let’s start small!", "wordpress-seo" ) }
  </p>
  <Button
  as="a"
  id="button-webinar-seo-dashboard"
  href={ webinarIntroFirstTimeConfigUrl }
  target="_blank"
  >
- { __( "Learn how to get the most out of Yoast SEO!", "wordpress-seo" ) }
+ { sprintf(
+ /* translators: 1: Yoast SEO. */
+ __( "Learn how to increase your rankings with %1$s", "wordpress-seo" ),
+ "Yoast SEO"
+ ) }
  <ArrowNarrowRightIcon className="yst-w-4 yst-h-4 yst-icon-rtl yst-ml-2" />
  </Button>
  <p className="yst-mt-4">