New build

_inc/build/admin.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'moment', 'react', 'react-dom', 'wp-components', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'ab063e7900ea1452dcc160a54583d67c');
+<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-components', 'wp-date', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => 'ff80655711882a8afa5357ca2792ae8e');

changelog.txt

@@ -13,6 +13,7 @@
 * Contact Form Block: display fallback link when the block is rendered in non-WordPress contexts, such as subscription emails.
 * Contact Form Block: display the correct default email address and subject in the form block settings.
 * Dashboard: clarify language around support options.
+* Dashboard: replace /plans and /plans-prompt routes with a redirect to cloud.jetpack.com/pricing.
 * Instagram Embeds: add support for embed parameters supported by Instagram.
 * Payments Block: move unreadable notice to the sidebar.
 * Pinterest Block: ensure that Pinterest embeds are displayed nicely in non-WordPress contexts, such as subscription emails.
@@ -37,6 +38,7 @@
 * Sharing: disable Open Graph Meta tags added by the Web Stories plugin when Jetpack's tags are active.
 * Stats: support Web Stories plugin.
 * Synchronization: ensure better synchronization of post meta data (used by Publicize, Subscriptions, Search) in WordPress 5.6.
+* Twenty Twenty-One: ensure that Jetpack's features are compatible with the upcoming new default theme
 
 **Bug fixes**
 

modules/theme-tools.php

@@ -43,6 +43,7 @@ function jetpack_load_theme_compat() {
 			'twentyseventeen' => JETPACK__PLUGIN_DIR . 'modules/theme-tools/compat/twentyseventeen.php',
 			'twentynineteen'  => JETPACK__PLUGIN_DIR . 'modules/theme-tools/compat/twentynineteen.php',
 			'twentytwenty'    => JETPACK__PLUGIN_DIR . 'modules/theme-tools/compat/twentytwenty.php',
+			'twentytwentyone' => JETPACK__PLUGIN_DIR . 'modules/theme-tools/compat/twentytwentyone.php',
 		)
 	);
 

modules/theme-tools/compat/twentytwentyone.css

@@ -0,0 +1,9 @@
+/**
+ * Related Posts
+ */
+
+.entry-content #jp-relatedposts {
+	max-width: var(--responsive--aligndefault-width);
+	margin-left: auto;
+	margin-right: auto;
+}

modules/theme-tools/compat/twentytwentyone.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Jetpack Compatibility File
+ * See: https://jetpack.com/
+ *
+ * @package Jetpack
+ */
+
+/**
+ * Add Jetpack extra functionality to Twenty Twenty One.
+ */
+function twentytwentyone_jetpack_setup() {
+	/**
+	 * Add theme support for geo-location.
+	 */
+	add_theme_support( 'jetpack-geo-location' );
+}
+add_action( 'after_setup_theme', 'twentytwentyone_jetpack_setup' );
+
+/**
+ * Add our compat CSS file for custom styles.
+ * Set the version equal to filemtime for development builds, and the JETPACK__VERSION for production
+ * or skip it entirely for wpcom.
+ */
+function twentytwentyone_enqueue_jetpack_style() {
+	$version = Jetpack::is_development_version()
+		? filemtime( JETPACK__PLUGIN_DIR . 'modules/theme-tools/compat/twentytwentyone.css' )
+		: JETPACK__VERSION;
+
+	wp_enqueue_style( 'twentytwentyone-jetpack', plugins_url( 'twentytwentyone.css', __FILE__ ), array(), $version );
+	wp_style_add_data( 'twentytwentyone-jetpack', 'rtl', 'replace' );
+}
+add_action( 'wp_enqueue_scripts', 'twentytwentyone_enqueue_jetpack_style' );

readme.txt

@@ -254,6 +254,7 @@ Our Cookie and Consent Banner can help you comply with GDPR. The European Union
 * Contact Form Block: display fallback link when the block is rendered in non-WordPress contexts, such as subscription emails.
 * Contact Form Block: display the correct default email address and subject in the form block settings.
 * Dashboard: clarify language around support options.
+* Dashboard: replace /plans and /plans-prompt routes with a redirect to cloud.jetpack.com/pricing.
 * Instagram Embeds: add support for embed parameters supported by Instagram.
 * Payments Block: move unreadable notice to the sidebar.
 * Pinterest Block: ensure that Pinterest embeds are displayed nicely in non-WordPress contexts, such as subscription emails.
@@ -278,6 +279,7 @@ Our Cookie and Consent Banner can help you comply with GDPR. The European Union
 * Sharing: disable Open Graph Meta tags added by the Web Stories plugin when Jetpack's tags are active.
 * Stats: support Web Stories plugin.
 * Synchronization: ensure better synchronization of post meta data (used by Publicize, Subscriptions, Search) in WordPress 5.6.
+* Twenty Twenty-One: ensure that Jetpack's features are compatible with the upcoming new default theme
 
 **Bug fixes**
 

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit322320f583925c267e07d92b1da9a1a8::getLoader();
+return ComposerAutoloaderInitd1d98095846009323198a1cfa823586a::getLoader();

vendor/autoload_packages.php

@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jp322320f583925c267e07d92b1da9a1a8;
+namespace Automattic\Jetpack\Autoloader\jpd1d98095846009323198a1cfa823586a;
 
  // phpcs:ignore
 

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit322320f583925c267e07d92b1da9a1a8
+class ComposerAutoloaderInitd1d98095846009323198a1cfa823586a
 {
     private static $loader;
 
@@ -22,15 +22,15 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit322320f583925c267e07d92b1da9a1a8', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitd1d98095846009323198a1cfa823586a', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit322320f583925c267e07d92b1da9a1a8', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitd1d98095846009323198a1cfa823586a', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit322320f583925c267e07d92b1da9a1a8::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitd1d98095846009323198a1cfa823586a::getInitializer($loader));
         } else {
             $classMap = require __DIR__ . '/autoload_classmap.php';
             if ($classMap) {
@@ -42,19 +42,19 @@ public static function getLoader()
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit322320f583925c267e07d92b1da9a1a8::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInitd1d98095846009323198a1cfa823586a::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire322320f583925c267e07d92b1da9a1a8($fileIdentifier, $file);
+            composerRequired1d98095846009323198a1cfa823586a($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire322320f583925c267e07d92b1da9a1a8($fileIdentifier, $file)
+function composerRequired1d98095846009323198a1cfa823586a($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit322320f583925c267e07d92b1da9a1a8
+class ComposerStaticInitd1d98095846009323198a1cfa823586a
 {
     public static $files = array (
         'bce4ecd6aabb2a2948e06d0e2c4ea9a6' => __DIR__ . '/..' . '/automattic/jetpack-connection/legacy/load-ixr.php',
@@ -147,10 +147,10 @@ class ComposerStaticInit322320f583925c267e07d92b1da9a1a8
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit322320f583925c267e07d92b1da9a1a8::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit322320f583925c267e07d92b1da9a1a8::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit322320f583925c267e07d92b1da9a1a8::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit322320f583925c267e07d92b1da9a1a8::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitd1d98095846009323198a1cfa823586a::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitd1d98095846009323198a1cfa823586a::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInitd1d98095846009323198a1cfa823586a::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInitd1d98095846009323198a1cfa823586a::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/jetpack-autoloader/autoload_functions.php

@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jp322320f583925c267e07d92b1da9a1a8;
+namespace Automattic\Jetpack\Autoloader\jpd1d98095846009323198a1cfa823586a;
 
  // phpcs:ignore
 

vendor/jetpack-autoloader/class-autoloader-handler.php

@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jp322320f583925c267e07d92b1da9a1a8;
+namespace Automattic\Jetpack\Autoloader\jpd1d98095846009323198a1cfa823586a;
 
  // phpcs:ignore
 

vendor/jetpack-autoloader/class-autoloader-locator.php

@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jp322320f583925c267e07d92b1da9a1a8;
+namespace Automattic\Jetpack\Autoloader\jpd1d98095846009323198a1cfa823586a;
 
  // phpcs:ignore
 

vendor/jetpack-autoloader/class-manifest-handler.php

@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jp322320f583925c267e07d92b1da9a1a8;
+namespace Automattic\Jetpack\Autoloader\jpd1d98095846009323198a1cfa823586a;
 
  // phpcs:ignore
 

vendor/jetpack-autoloader/class-plugins-handler.php

@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jp322320f583925c267e07d92b1da9a1a8;
+namespace Automattic\Jetpack\Autoloader\jpd1d98095846009323198a1cfa823586a;
 
  // phpcs:ignore
 

vendor/jetpack-autoloader/class-version-loader.php

@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jp322320f583925c267e07d92b1da9a1a8;
+namespace Automattic\Jetpack\Autoloader\jpd1d98095846009323198a1cfa823586a;
 
  // phpcs:ignore
 

vendor/jetpack-autoloader/class-version-selector.php

@@ -5,7 +5,7 @@
  * @package automattic/jetpack-autoloader
  */
 
-namespace Automattic\Jetpack\Autoloader\jp322320f583925c267e07d92b1da9a1a8;
+namespace Automattic\Jetpack\Autoloader\jpd1d98095846009323198a1cfa823586a;
 
  // phpcs:ignore