From 98b1330d01b307a3445e38ba73691003fd1248b7 Mon Sep 17 00:00:00 2001 From: Gergely Juhasz Date: Tue, 30 Jul 2024 13:26:21 +0200 Subject: [PATCH 1/5] Remove filter while the fatals are being fixed --- projects/packages/publicize/src/class-publicize-base.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/packages/publicize/src/class-publicize-base.php b/projects/packages/publicize/src/class-publicize-base.php index 7a0aff62c171c..e4195b728af71 100644 --- a/projects/packages/publicize/src/class-publicize-base.php +++ b/projects/packages/publicize/src/class-publicize-base.php @@ -254,10 +254,6 @@ public function __construct() { // The custom priority for this action ensures that any existing code that // removes post-thumbnails support during 'init' continues to work. add_action( 'init', __NAMESPACE__ . '\add_theme_post_thumbnails_support', 8 ); - - // Add a Fediverse Open Graph Tag when an author has connected their Mastodon account. - add_filter( 'jetpack_open_graph_tags', array( $this, 'add_fediverse_creator_open_graph_tag' ), 10, 1 ); - add_filter( 'jetpack_open_graph_output', array( $this, 'filter_fediverse_cards_output' ), 10, 1 ); } /** From e42fda6efb93362157959987ea96bd449cd279e0 Mon Sep 17 00:00:00 2001 From: Gergely Juhasz Date: Tue, 30 Jul 2024 13:27:03 +0200 Subject: [PATCH 2/5] changelog --- .../changelog/fix-mastodon-fediverse-creator-og-fatals | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 projects/packages/publicize/changelog/fix-mastodon-fediverse-creator-og-fatals diff --git a/projects/packages/publicize/changelog/fix-mastodon-fediverse-creator-og-fatals b/projects/packages/publicize/changelog/fix-mastodon-fediverse-creator-og-fatals new file mode 100644 index 0000000000000..b96a56198a3c4 --- /dev/null +++ b/projects/packages/publicize/changelog/fix-mastodon-fediverse-creator-og-fatals @@ -0,0 +1,4 @@ +Significance: patch +Type: removed + +Removed Fediverse og filters to fix fatals From ce7a5a73fea668aeefaa1d7dd27e73622b8c8e4f Mon Sep 17 00:00:00 2001 From: Gergely Juhasz Date: Tue, 30 Jul 2024 15:19:27 +0200 Subject: [PATCH 3/5] Fixup versions --- projects/js-packages/ai-client/package.json | 2 +- projects/js-packages/publicize-components/package.json | 2 +- projects/packages/jetpack-mu-wpcom/composer.json | 2 +- projects/packages/jetpack-mu-wpcom/package.json | 2 +- .../packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php | 2 +- projects/packages/my-jetpack/package.json | 2 +- projects/packages/my-jetpack/src/class-initializer.php | 2 +- projects/packages/videopress/package.json | 2 +- projects/packages/videopress/src/class-package-version.php | 2 +- projects/plugins/mu-wpcom-plugin/composer.json | 2 +- projects/plugins/mu-wpcom-plugin/composer.lock | 4 ++-- projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php | 2 +- projects/plugins/mu-wpcom-plugin/package.json | 2 +- projects/plugins/wpcomsh/composer.json | 2 +- projects/plugins/wpcomsh/composer.lock | 4 ++-- projects/plugins/wpcomsh/package.json | 2 +- projects/plugins/wpcomsh/wpcomsh.php | 4 ++-- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/projects/js-packages/ai-client/package.json b/projects/js-packages/ai-client/package.json index d4670009a0f77..e81446ecdc71f 100644 --- a/projects/js-packages/ai-client/package.json +++ b/projects/js-packages/ai-client/package.json @@ -1,7 +1,7 @@ { "private": false, "name": "@automattic/jetpack-ai-client", - "version": "0.16.0", + "version": "0.16.1-alpha", "description": "A JS client for consuming Jetpack AI services", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/ai-client/#readme", "bugs": { diff --git a/projects/js-packages/publicize-components/package.json b/projects/js-packages/publicize-components/package.json index cb05fc7f83773..1897a5481b46d 100644 --- a/projects/js-packages/publicize-components/package.json +++ b/projects/js-packages/publicize-components/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-publicize-components", - "version": "0.57.0", + "version": "0.58.0-alpha", "description": "A library of JS components required by the Publicize editor plugin", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/publicize-components/#readme", "bugs": { diff --git a/projects/packages/jetpack-mu-wpcom/composer.json b/projects/packages/jetpack-mu-wpcom/composer.json index 04b4ff41f807f..14e966c6f40de 100644 --- a/projects/packages/jetpack-mu-wpcom/composer.json +++ b/projects/packages/jetpack-mu-wpcom/composer.json @@ -62,7 +62,7 @@ }, "autotagger": true, "branch-alias": { - "dev-trunk": "5.51.x-dev" + "dev-trunk": "5.52.x-dev" }, "textdomain": "jetpack-mu-wpcom", "version-constants": { diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json index 45b0d1f3f8e20..396f76c697818 100644 --- a/projects/packages/jetpack-mu-wpcom/package.json +++ b/projects/packages/jetpack-mu-wpcom/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-mu-wpcom", - "version": "5.51.0", + "version": "5.52.0-alpha", "description": "Enhances your site with features powered by WordPress.com", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/jetpack-mu-wpcom/#readme", "bugs": { diff --git a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php index 151d0c59e86e6..2c4cc857e3ebf 100644 --- a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php +++ b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php @@ -13,7 +13,7 @@ * Jetpack_Mu_Wpcom main class. */ class Jetpack_Mu_Wpcom { - const PACKAGE_VERSION = '5.51.0'; + const PACKAGE_VERSION = '5.52.0-alpha'; const PKG_DIR = __DIR__ . '/../'; const BASE_DIR = __DIR__ . '/'; const BASE_FILE = __FILE__; diff --git a/projects/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json index c18a50e1b0c88..88f9043204d4f 100644 --- a/projects/packages/my-jetpack/package.json +++ b/projects/packages/my-jetpack/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-my-jetpack", - "version": "4.30.0", + "version": "4.30.1-alpha", "description": "WP Admin page with information and configuration shared among all Jetpack stand-alone plugins", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/my-jetpack/#readme", "bugs": { diff --git a/projects/packages/my-jetpack/src/class-initializer.php b/projects/packages/my-jetpack/src/class-initializer.php index 20ef06cc7a4d8..13634e2addae2 100644 --- a/projects/packages/my-jetpack/src/class-initializer.php +++ b/projects/packages/my-jetpack/src/class-initializer.php @@ -41,7 +41,7 @@ class Initializer { * * @var string */ - const PACKAGE_VERSION = '4.30.0'; + const PACKAGE_VERSION = '4.30.1-alpha'; /** * HTML container ID for the IDC screen on My Jetpack page. diff --git a/projects/packages/videopress/package.json b/projects/packages/videopress/package.json index a886678761c8e..a7661afe049af 100644 --- a/projects/packages/videopress/package.json +++ b/projects/packages/videopress/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-videopress", - "version": "0.23.29", + "version": "0.23.30-alpha", "description": "VideoPress package", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/videopress/#readme", "bugs": { diff --git a/projects/packages/videopress/src/class-package-version.php b/projects/packages/videopress/src/class-package-version.php index d89bada217daf..16629ed952118 100644 --- a/projects/packages/videopress/src/class-package-version.php +++ b/projects/packages/videopress/src/class-package-version.php @@ -11,7 +11,7 @@ * The Package_Version class. */ class Package_Version { - const PACKAGE_VERSION = '0.23.29'; + const PACKAGE_VERSION = '0.23.30-alpha'; const PACKAGE_SLUG = 'videopress'; diff --git a/projects/plugins/mu-wpcom-plugin/composer.json b/projects/plugins/mu-wpcom-plugin/composer.json index 6508004317ec5..284b15ddddcdd 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.json +++ b/projects/plugins/mu-wpcom-plugin/composer.json @@ -46,6 +46,6 @@ ] }, "config": { - "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_5_2" + "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_5_3_alpha" } } diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock index eb52a1a568894..54cdd560ac5fb 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.lock +++ b/projects/plugins/mu-wpcom-plugin/composer.lock @@ -1005,7 +1005,7 @@ "dist": { "type": "path", "url": "../../packages/jetpack-mu-wpcom", - "reference": "2827550808c6c48c4760c787ce52592d9012059e" + "reference": "a9ffd2d847bb68899b38f0b6916a33e917fe2c90" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1039,7 +1039,7 @@ }, "autotagger": true, "branch-alias": { - "dev-trunk": "5.51.x-dev" + "dev-trunk": "5.52.x-dev" }, "textdomain": "jetpack-mu-wpcom", "version-constants": { diff --git a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php index 43dc9301cb7cd..60fd1f098ca8e 100644 --- a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php +++ b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php @@ -3,7 +3,7 @@ * * Plugin Name: WordPress.com Features * Description: Test plugin for the jetpack-mu-wpcom package - * Version: 2.5.2 + * Version: 2.5.3-alpha * Author: Automattic * License: GPLv2 or later * Text Domain: jetpack-mu-wpcom-plugin diff --git a/projects/plugins/mu-wpcom-plugin/package.json b/projects/plugins/mu-wpcom-plugin/package.json index 527941b01f3c4..fdab5b4842b9f 100644 --- a/projects/plugins/mu-wpcom-plugin/package.json +++ b/projects/plugins/mu-wpcom-plugin/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-mu-wpcom-plugin", - "version": "2.5.2", + "version": "2.5.3-alpha", "description": "Test plugin for the jetpack-mu-wpcom package", "homepage": "https://jetpack.com", "bugs": { diff --git a/projects/plugins/wpcomsh/composer.json b/projects/plugins/wpcomsh/composer.json index b2a1a96dcd4a8..2f905ff13f9a1 100644 --- a/projects/plugins/wpcomsh/composer.json +++ b/projects/plugins/wpcomsh/composer.json @@ -128,7 +128,7 @@ "composer/installers": true, "roots/wordpress-core-installer": true }, - "autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_1_0" + "autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_1_1_alpha" }, "extra": { "mirror-repo": "Automattic/wpcom-site-helper", diff --git a/projects/plugins/wpcomsh/composer.lock b/projects/plugins/wpcomsh/composer.lock index 9aee4e3f31fc6..7544fbbb8f3c2 100644 --- a/projects/plugins/wpcomsh/composer.lock +++ b/projects/plugins/wpcomsh/composer.lock @@ -1142,7 +1142,7 @@ "dist": { "type": "path", "url": "../../packages/jetpack-mu-wpcom", - "reference": "2827550808c6c48c4760c787ce52592d9012059e" + "reference": "a9ffd2d847bb68899b38f0b6916a33e917fe2c90" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1176,7 +1176,7 @@ }, "autotagger": true, "branch-alias": { - "dev-trunk": "5.51.x-dev" + "dev-trunk": "5.52.x-dev" }, "textdomain": "jetpack-mu-wpcom", "version-constants": { diff --git a/projects/plugins/wpcomsh/package.json b/projects/plugins/wpcomsh/package.json index d45d9ea27a76f..2c7064c1ad0c4 100644 --- a/projects/plugins/wpcomsh/package.json +++ b/projects/plugins/wpcomsh/package.json @@ -3,7 +3,7 @@ "name": "@automattic/jetpack-wpcomsh", "description": "A helper for connecting WordPress.com sites to external host infrastructure.", "homepage": "https://jetpack.com", - "version": "5.1.0", + "version": "5.1.1-alpha", "bugs": { "url": "https://github.com/Automattic/jetpack/labels/[Plugin] Wpcomsh" }, diff --git a/projects/plugins/wpcomsh/wpcomsh.php b/projects/plugins/wpcomsh/wpcomsh.php index 2b99c9570789e..6f6d12ba4197b 100644 --- a/projects/plugins/wpcomsh/wpcomsh.php +++ b/projects/plugins/wpcomsh/wpcomsh.php @@ -2,14 +2,14 @@ /** * Plugin Name: WordPress.com Site Helper * Description: A helper for connecting WordPress.com sites to external host infrastructure. - * Version: 5.1.0 + * Version: 5.1.1-alpha * Author: Automattic * Author URI: http://automattic.com/ * * @package wpcomsh */ -define( 'WPCOMSH_VERSION', '5.1.0' ); +define( 'WPCOMSH_VERSION', '5.1.1-alpha' ); // If true, Typekit fonts will be available in addition to Google fonts add_filter( 'jetpack_fonts_enable_typekit', '__return_true' ); From 9b9a9e9c9adfbf4a11277200b22dd655577de6a9 Mon Sep 17 00:00:00 2001 From: Gergely Juhasz Date: Tue, 30 Jul 2024 15:26:18 +0200 Subject: [PATCH 4/5] changelog --- .../changelog/fix-mastodon-fediverse-creator-og-fatals | 4 ++++ .../changelog/fix-mastodon-fediverse-creator-og-fatals | 4 ++++ .../changelog/fix-mastodon-fediverse-creator-og-fatals | 4 ++++ .../changelog/fix-mastodon-fediverse-creator-og-fatals | 4 ++++ .../changelog/fix-mastodon-fediverse-creator-og-fatals | 4 ++++ .../changelog/fix-mastodon-fediverse-creator-og-fatals | 4 ++++ .../changelog/fix-mastodon-fediverse-creator-og-fatals | 4 ++++ 7 files changed, 28 insertions(+) create mode 100644 projects/js-packages/ai-client/changelog/fix-mastodon-fediverse-creator-og-fatals create mode 100644 projects/js-packages/publicize-components/changelog/fix-mastodon-fediverse-creator-og-fatals create mode 100644 projects/packages/jetpack-mu-wpcom/changelog/fix-mastodon-fediverse-creator-og-fatals create mode 100644 projects/packages/my-jetpack/changelog/fix-mastodon-fediverse-creator-og-fatals create mode 100644 projects/packages/videopress/changelog/fix-mastodon-fediverse-creator-og-fatals create mode 100644 projects/plugins/mu-wpcom-plugin/changelog/fix-mastodon-fediverse-creator-og-fatals create mode 100644 projects/plugins/wpcomsh/changelog/fix-mastodon-fediverse-creator-og-fatals diff --git a/projects/js-packages/ai-client/changelog/fix-mastodon-fediverse-creator-og-fatals b/projects/js-packages/ai-client/changelog/fix-mastodon-fediverse-creator-og-fatals new file mode 100644 index 0000000000000..f379a9a899dab --- /dev/null +++ b/projects/js-packages/ai-client/changelog/fix-mastodon-fediverse-creator-og-fatals @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Fixup versions diff --git a/projects/js-packages/publicize-components/changelog/fix-mastodon-fediverse-creator-og-fatals b/projects/js-packages/publicize-components/changelog/fix-mastodon-fediverse-creator-og-fatals new file mode 100644 index 0000000000000..f379a9a899dab --- /dev/null +++ b/projects/js-packages/publicize-components/changelog/fix-mastodon-fediverse-creator-og-fatals @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Fixup versions diff --git a/projects/packages/jetpack-mu-wpcom/changelog/fix-mastodon-fediverse-creator-og-fatals b/projects/packages/jetpack-mu-wpcom/changelog/fix-mastodon-fediverse-creator-og-fatals new file mode 100644 index 0000000000000..f379a9a899dab --- /dev/null +++ b/projects/packages/jetpack-mu-wpcom/changelog/fix-mastodon-fediverse-creator-og-fatals @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Fixup versions diff --git a/projects/packages/my-jetpack/changelog/fix-mastodon-fediverse-creator-og-fatals b/projects/packages/my-jetpack/changelog/fix-mastodon-fediverse-creator-og-fatals new file mode 100644 index 0000000000000..f379a9a899dab --- /dev/null +++ b/projects/packages/my-jetpack/changelog/fix-mastodon-fediverse-creator-og-fatals @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Fixup versions diff --git a/projects/packages/videopress/changelog/fix-mastodon-fediverse-creator-og-fatals b/projects/packages/videopress/changelog/fix-mastodon-fediverse-creator-og-fatals new file mode 100644 index 0000000000000..f379a9a899dab --- /dev/null +++ b/projects/packages/videopress/changelog/fix-mastodon-fediverse-creator-og-fatals @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Fixup versions diff --git a/projects/plugins/mu-wpcom-plugin/changelog/fix-mastodon-fediverse-creator-og-fatals b/projects/plugins/mu-wpcom-plugin/changelog/fix-mastodon-fediverse-creator-og-fatals new file mode 100644 index 0000000000000..f379a9a899dab --- /dev/null +++ b/projects/plugins/mu-wpcom-plugin/changelog/fix-mastodon-fediverse-creator-og-fatals @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Fixup versions diff --git a/projects/plugins/wpcomsh/changelog/fix-mastodon-fediverse-creator-og-fatals b/projects/plugins/wpcomsh/changelog/fix-mastodon-fediverse-creator-og-fatals new file mode 100644 index 0000000000000..f379a9a899dab --- /dev/null +++ b/projects/plugins/wpcomsh/changelog/fix-mastodon-fediverse-creator-og-fatals @@ -0,0 +1,4 @@ +Significance: patch +Type: changed + +Fixup versions From efc9a1babf14fdbd092db88c64c556ed31bfc260 Mon Sep 17 00:00:00 2001 From: Gergely Juhasz Date: Tue, 30 Jul 2024 15:32:54 +0200 Subject: [PATCH 5/5] Fixup versions --- projects/packages/jetpack-mu-wpcom/package.json | 2 +- .../packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php | 2 +- projects/plugins/mu-wpcom-plugin/composer.json | 2 +- projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php | 2 +- projects/plugins/mu-wpcom-plugin/package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json index 659dece6176ea..82fb56fe87d3b 100644 --- a/projects/packages/jetpack-mu-wpcom/package.json +++ b/projects/packages/jetpack-mu-wpcom/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-mu-wpcom", - "version": "5.52.0", + "version": "5.52.1-alpha", "description": "Enhances your site with features powered by WordPress.com", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/jetpack-mu-wpcom/#readme", "bugs": { diff --git a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php index ccbfcc39e5fc0..4867ca06ca8fc 100644 --- a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php +++ b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php @@ -13,7 +13,7 @@ * Jetpack_Mu_Wpcom main class. */ class Jetpack_Mu_Wpcom { - const PACKAGE_VERSION = '5.52.0'; + const PACKAGE_VERSION = '5.52.1-alpha'; const PKG_DIR = __DIR__ . '/../'; const BASE_DIR = __DIR__ . '/'; const BASE_FILE = __FILE__; diff --git a/projects/plugins/mu-wpcom-plugin/composer.json b/projects/plugins/mu-wpcom-plugin/composer.json index 4fb4be696e783..c9c1d5665e209 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.json +++ b/projects/plugins/mu-wpcom-plugin/composer.json @@ -46,6 +46,6 @@ ] }, "config": { - "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_5_3" + "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_5_4_alpha" } } diff --git a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php index ac19be5ebb7c1..56b7db19f7081 100644 --- a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php +++ b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php @@ -3,7 +3,7 @@ * * Plugin Name: WordPress.com Features * Description: Test plugin for the jetpack-mu-wpcom package - * Version: 2.5.3 + * Version: 2.5.4-alpha * Author: Automattic * License: GPLv2 or later * Text Domain: jetpack-mu-wpcom-plugin diff --git a/projects/plugins/mu-wpcom-plugin/package.json b/projects/plugins/mu-wpcom-plugin/package.json index 872e449268b64..740cebc6e5a4a 100644 --- a/projects/plugins/mu-wpcom-plugin/package.json +++ b/projects/plugins/mu-wpcom-plugin/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-mu-wpcom-plugin", - "version": "2.5.3", + "version": "2.5.4-alpha", "description": "Test plugin for the jetpack-mu-wpcom package", "homepage": "https://jetpack.com", "bugs": {