From fa559b8d1e2382e18cd022fdbb1e622916f49a3b Mon Sep 17 00:00:00 2001 From: Nate Weller Date: Fri, 26 Jul 2024 17:19:27 -0600 Subject: [PATCH] Sync firewall options (#37957) --- projects/packages/sync/changelog/add-waf-options | 4 ++++ projects/packages/sync/composer.json | 2 +- projects/packages/sync/src/class-defaults.php | 8 ++++++++ .../packages/sync/src/class-package-version.php | 2 +- .../changelog/add-sync-waf-options | 5 +++++ .../automattic-for-agencies-client/composer.lock | 4 ++-- .../backup/changelog/add-sync-waf-options | 5 +++++ projects/plugins/backup/composer.lock | 4 ++-- .../plugins/boost/changelog/add-sync-waf-options | 5 +++++ projects/plugins/boost/composer.lock | 4 ++-- .../jetpack/changelog/add-sync-waf-options | 5 +++++ .../changelog/add-waf-options-to-rest-api | 4 ++++ projects/plugins/jetpack/composer.lock | 4 ++-- ...ass.wpcom-json-api-site-settings-endpoint.php | 16 ++++++++++++++++ .../php/sync/test_class.jetpack-sync-options.php | 8 ++++++++ .../migration/changelog/add-sync-waf-options | 5 +++++ projects/plugins/migration/composer.lock | 4 ++-- .../changelog/add-sync-waf-options | 5 +++++ projects/plugins/mu-wpcom-plugin/composer.lock | 4 ++-- .../protect/changelog/add-sync-waf-options | 5 +++++ projects/plugins/protect/composer.lock | 4 ++-- .../search/changelog/add-sync-waf-options | 5 +++++ projects/plugins/search/composer.lock | 4 ++-- .../social/changelog/add-sync-waf-options | 5 +++++ projects/plugins/social/composer.lock | 4 ++-- .../changelog/add-sync-waf-options | 5 +++++ projects/plugins/starter-plugin/composer.lock | 4 ++-- .../videopress/changelog/add-sync-waf-options | 5 +++++ projects/plugins/videopress/composer.lock | 4 ++-- .../wpcomsh/changelog/add-sync-waf-options | 5 +++++ projects/plugins/wpcomsh/composer.json | 2 +- projects/plugins/wpcomsh/composer.lock | 4 ++-- projects/plugins/wpcomsh/package.json | 2 +- projects/plugins/wpcomsh/wpcomsh.php | 4 ++-- 34 files changed, 130 insertions(+), 30 deletions(-) create mode 100644 projects/packages/sync/changelog/add-waf-options create mode 100644 projects/plugins/automattic-for-agencies-client/changelog/add-sync-waf-options create mode 100644 projects/plugins/backup/changelog/add-sync-waf-options create mode 100644 projects/plugins/boost/changelog/add-sync-waf-options create mode 100644 projects/plugins/jetpack/changelog/add-sync-waf-options create mode 100644 projects/plugins/jetpack/changelog/add-waf-options-to-rest-api create mode 100644 projects/plugins/migration/changelog/add-sync-waf-options create mode 100644 projects/plugins/mu-wpcom-plugin/changelog/add-sync-waf-options create mode 100644 projects/plugins/protect/changelog/add-sync-waf-options create mode 100644 projects/plugins/search/changelog/add-sync-waf-options create mode 100644 projects/plugins/social/changelog/add-sync-waf-options create mode 100644 projects/plugins/starter-plugin/changelog/add-sync-waf-options create mode 100644 projects/plugins/videopress/changelog/add-sync-waf-options create mode 100644 projects/plugins/wpcomsh/changelog/add-sync-waf-options diff --git a/projects/packages/sync/changelog/add-waf-options b/projects/packages/sync/changelog/add-waf-options new file mode 100644 index 0000000000000..861c31c1a1423 --- /dev/null +++ b/projects/packages/sync/changelog/add-waf-options @@ -0,0 +1,4 @@ +Significance: minor +Type: added + +Add support for syncing Jetpack WAF options. diff --git a/projects/packages/sync/composer.json b/projects/packages/sync/composer.json index ca3d9480ac16f..8799ba2a01ed2 100644 --- a/projects/packages/sync/composer.json +++ b/projects/packages/sync/composer.json @@ -59,7 +59,7 @@ "link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/packages/sync/src/class-defaults.php b/projects/packages/sync/src/class-defaults.php index a435a05283a4d..2119edf18026e 100644 --- a/projects/packages/sync/src/class-defaults.php +++ b/projects/packages/sync/src/class-defaults.php @@ -206,6 +206,14 @@ class Defaults { 'jetpack_package_versions', 'jetpack_newsletters_publishing_default_frequency', 'jetpack_scheduled_plugins_update', + 'jetpack_waf_automatic_rules', + 'jetpack_waf_ip_allow_list', + 'jetpack_waf_ip_allow_list_enabled', + 'jetpack_waf_ip_block_list', + 'jetpack_waf_ip_block_list_enabled', + 'jetpack_waf_share_data', + 'jetpack_waf_share_debug_data', + 'jetpack_waf_automatic_rules_last_updated_timestamp', ); /** diff --git a/projects/packages/sync/src/class-package-version.php b/projects/packages/sync/src/class-package-version.php index 03da5603a7422..4a3f0e6717bf5 100644 --- a/projects/packages/sync/src/class-package-version.php +++ b/projects/packages/sync/src/class-package-version.php @@ -12,7 +12,7 @@ */ class Package_Version { - const PACKAGE_VERSION = '3.3.1'; + const PACKAGE_VERSION = '3.4.0-alpha'; const PACKAGE_SLUG = 'sync'; diff --git a/projects/plugins/automattic-for-agencies-client/changelog/add-sync-waf-options b/projects/plugins/automattic-for-agencies-client/changelog/add-sync-waf-options new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/automattic-for-agencies-client/changelog/add-sync-waf-options @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/automattic-for-agencies-client/composer.lock b/projects/plugins/automattic-for-agencies-client/composer.lock index 108b3c29ee068..3f8db4e218e78 100644 --- a/projects/plugins/automattic-for-agencies-client/composer.lock +++ b/projects/plugins/automattic-for-agencies-client/composer.lock @@ -862,7 +862,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "9e674c384f72544b488e3af3d9348692d32cee54" + "reference": "2965d36db9a224b6e142e46c92358b353eca463a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -895,7 +895,7 @@ "link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/backup/changelog/add-sync-waf-options b/projects/plugins/backup/changelog/add-sync-waf-options new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/backup/changelog/add-sync-waf-options @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock index 8b2d511f712f9..30ea65e2aabd9 100644 --- a/projects/plugins/backup/composer.lock +++ b/projects/plugins/backup/composer.lock @@ -1741,7 +1741,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "9e674c384f72544b488e3af3d9348692d32cee54" + "reference": "2965d36db9a224b6e142e46c92358b353eca463a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1774,7 +1774,7 @@ "link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/boost/changelog/add-sync-waf-options b/projects/plugins/boost/changelog/add-sync-waf-options new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/boost/changelog/add-sync-waf-options @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock index 47d385da19bf9..bfe0d0aa1edba 100644 --- a/projects/plugins/boost/composer.lock +++ b/projects/plugins/boost/composer.lock @@ -1725,7 +1725,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "9e674c384f72544b488e3af3d9348692d32cee54" + "reference": "2965d36db9a224b6e142e46c92358b353eca463a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1758,7 +1758,7 @@ "link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/jetpack/changelog/add-sync-waf-options b/projects/plugins/jetpack/changelog/add-sync-waf-options new file mode 100644 index 0000000000000..a1c1831fa1ef7 --- /dev/null +++ b/projects/plugins/jetpack/changelog/add-sync-waf-options @@ -0,0 +1,5 @@ +Significance: patch +Type: other +Comment: Updated composer.lock. + + diff --git a/projects/plugins/jetpack/changelog/add-waf-options-to-rest-api b/projects/plugins/jetpack/changelog/add-waf-options-to-rest-api new file mode 100644 index 0000000000000..10470287436b6 --- /dev/null +++ b/projects/plugins/jetpack/changelog/add-waf-options-to-rest-api @@ -0,0 +1,4 @@ +Significance: minor +Type: other + +WPCOM Settings API: Add synced options from Jetpack WAF. diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock index 1a72ee426ead3..f23379f926ad4 100644 --- a/projects/plugins/jetpack/composer.lock +++ b/projects/plugins/jetpack/composer.lock @@ -2683,7 +2683,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "9e674c384f72544b488e3af3d9348692d32cee54" + "reference": "2965d36db9a224b6e142e46c92358b353eca463a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -2716,7 +2716,7 @@ "link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php index 49fa3e5f7bd23..8f68527994263 100644 --- a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php +++ b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php @@ -126,6 +126,14 @@ 'jetpack_subscriptions_login_navigation_enabled' => '(bool) Whether the Subscriber Login block navigation placement is enabled', 'jetpack_subscriptions_subscribe_navigation_enabled' => '(Bool) Whether the Subscribe block navigation placement is enabled', 'wpcom_ai_site_prompt' => '(string) User input in the AI site prompt', + 'jetpack_waf_automatic_rules' => '(bool) Whether the WAF should enforce automatic firewall rules', + 'jetpack_waf_ip_allow_list' => '(string) List of IP addresses to always allow', + 'jetpack_waf_ip_allow_list_enabled' => '(bool) Whether the IP allow list is enabled', + 'jetpack_waf_ip_block_list' => '(string) List of IP addresses the WAF should always block', + 'jetpack_waf_ip_block_list_enabled' => '(bool) Whether the IP block list is enabled', + 'jetpack_waf_share_data' => '(bool) Whether the WAF should share basic data with Jetpack', + 'jetpack_waf_share_debug_data' => '(bool) Whether the WAF should share debug data with Jetpack', + 'jetpack_waf_automatic_rules_last_updated_timestamp' => '(int) Timestamp of the last time the automatic rules were updated', ), 'response_format' => array( @@ -480,6 +488,14 @@ function ( $newsletter_category ) { 'jetpack_comment_form_color_scheme' => (string) get_option( 'jetpack_comment_form_color_scheme' ), 'in_site_migration_flow' => (string) get_option( 'in_site_migration_flow', '' ), 'migration_source_site_domain' => (string) get_option( 'migration_source_site_domain' ), + 'jetpack_waf_automatic_rules' => (bool) get_option( 'jetpack_waf_automatic_rules' ), + 'jetpack_waf_ip_allow_list' => (string) get_option( 'jetpack_waf_ip_allow_list' ), + 'jetpack_waf_ip_allow_list_enabled' => (bool) get_option( 'jetpack_waf_ip_allow_list_enabled' ), + 'jetpack_waf_ip_block_list' => (string) get_option( 'jetpack_waf_ip_block_list' ), + 'jetpack_waf_ip_block_list_enabled' => (bool) get_option( 'jetpack_waf_ip_block_list_enabled' ), + 'jetpack_waf_share_data' => (bool) get_option( 'jetpack_waf_share_data' ), + 'jetpack_waf_share_debug_data' => (bool) get_option( 'jetpack_waf_share_debug_data' ), + 'jetpack_waf_automatic_rules_last_updated_timestamp' => (int) get_option( 'jetpack_waf_automatic_rules_last_updated_timestamp' ), ); if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) { diff --git a/projects/plugins/jetpack/tests/php/sync/test_class.jetpack-sync-options.php b/projects/plugins/jetpack/tests/php/sync/test_class.jetpack-sync-options.php index b29e617fc16e4..dfd370af20f5d 100644 --- a/projects/plugins/jetpack/tests/php/sync/test_class.jetpack-sync-options.php +++ b/projects/plugins/jetpack/tests/php/sync/test_class.jetpack-sync-options.php @@ -266,6 +266,14 @@ public function test_sync_default_options() { 'jetpack_package_versions' => array(), 'jetpack_newsletters_publishing_default_frequency' => 'weekly', 'jetpack_scheduled_plugins_update' => array(), + 'jetpack_waf_automatic_rules' => false, + 'jetpack_waf_ip_allow_list' => 'pineapple', + 'jetpack_waf_ip_allow_list_enabled' => false, + 'jetpack_waf_ip_block_list' => 'pineapple', + 'jetpack_waf_ip_block_list_enabled' => false, + 'jetpack_waf_share_data' => true, + 'jetpack_waf_share_debug_data' => false, + 'jetpack_waf_automatic_rules_last_updated_timestamp' => 0, ); $theme_mod_key = 'theme_mods_' . get_option( 'stylesheet' ); diff --git a/projects/plugins/migration/changelog/add-sync-waf-options b/projects/plugins/migration/changelog/add-sync-waf-options new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/migration/changelog/add-sync-waf-options @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/migration/composer.lock b/projects/plugins/migration/composer.lock index cf61b5acc8d67..9e14fbd0dc35f 100644 --- a/projects/plugins/migration/composer.lock +++ b/projects/plugins/migration/composer.lock @@ -1741,7 +1741,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "9e674c384f72544b488e3af3d9348692d32cee54" + "reference": "2965d36db9a224b6e142e46c92358b353eca463a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1774,7 +1774,7 @@ "link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/mu-wpcom-plugin/changelog/add-sync-waf-options b/projects/plugins/mu-wpcom-plugin/changelog/add-sync-waf-options new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/mu-wpcom-plugin/changelog/add-sync-waf-options @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock index 0cb4a8fe9efe5..121f2c172732b 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.lock +++ b/projects/plugins/mu-wpcom-plugin/composer.lock @@ -1506,7 +1506,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "9e674c384f72544b488e3af3d9348692d32cee54" + "reference": "2965d36db9a224b6e142e46c92358b353eca463a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1539,7 +1539,7 @@ "link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/protect/changelog/add-sync-waf-options b/projects/plugins/protect/changelog/add-sync-waf-options new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/protect/changelog/add-sync-waf-options @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock index 2cb22bf30ca05..2d53af551a69b 100644 --- a/projects/plugins/protect/composer.lock +++ b/projects/plugins/protect/composer.lock @@ -1654,7 +1654,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "9e674c384f72544b488e3af3d9348692d32cee54" + "reference": "2965d36db9a224b6e142e46c92358b353eca463a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1687,7 +1687,7 @@ "link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/search/changelog/add-sync-waf-options b/projects/plugins/search/changelog/add-sync-waf-options new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/search/changelog/add-sync-waf-options @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock index 9ed53f825c949..df2a8905bf9f9 100644 --- a/projects/plugins/search/composer.lock +++ b/projects/plugins/search/composer.lock @@ -1746,7 +1746,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "9e674c384f72544b488e3af3d9348692d32cee54" + "reference": "2965d36db9a224b6e142e46c92358b353eca463a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1779,7 +1779,7 @@ "link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/social/changelog/add-sync-waf-options b/projects/plugins/social/changelog/add-sync-waf-options new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/social/changelog/add-sync-waf-options @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock index 17d9822d4b305..be276ced5ad4d 100644 --- a/projects/plugins/social/composer.lock +++ b/projects/plugins/social/composer.lock @@ -1736,7 +1736,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "9e674c384f72544b488e3af3d9348692d32cee54" + "reference": "2965d36db9a224b6e142e46c92358b353eca463a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1769,7 +1769,7 @@ "link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/starter-plugin/changelog/add-sync-waf-options b/projects/plugins/starter-plugin/changelog/add-sync-waf-options new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/starter-plugin/changelog/add-sync-waf-options @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock index 71678b34170cb..99f3baf0625b9 100644 --- a/projects/plugins/starter-plugin/composer.lock +++ b/projects/plugins/starter-plugin/composer.lock @@ -1597,7 +1597,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "9e674c384f72544b488e3af3d9348692d32cee54" + "reference": "2965d36db9a224b6e142e46c92358b353eca463a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1630,7 +1630,7 @@ "link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/videopress/changelog/add-sync-waf-options b/projects/plugins/videopress/changelog/add-sync-waf-options new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/videopress/changelog/add-sync-waf-options @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/videopress/composer.lock b/projects/plugins/videopress/composer.lock index 1e621cb78aa9d..52e3e96172dd8 100644 --- a/projects/plugins/videopress/composer.lock +++ b/projects/plugins/videopress/composer.lock @@ -1597,7 +1597,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "9e674c384f72544b488e3af3d9348692d32cee54" + "reference": "2965d36db9a224b6e142e46c92358b353eca463a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1630,7 +1630,7 @@ "link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/wpcomsh/changelog/add-sync-waf-options b/projects/plugins/wpcomsh/changelog/add-sync-waf-options new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/wpcomsh/changelog/add-sync-waf-options @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/wpcomsh/composer.json b/projects/plugins/wpcomsh/composer.json index 89c32ce0db16d..02030e41b2a87 100644 --- a/projects/plugins/wpcomsh/composer.json +++ b/projects/plugins/wpcomsh/composer.json @@ -129,7 +129,7 @@ "composer/installers": true, "roots/wordpress-core-installer": true }, - "autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_0_3" + "autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_0_4_alpha" }, "extra": { "mirror-repo": "Automattic/wpcom-site-helper", diff --git a/projects/plugins/wpcomsh/composer.lock b/projects/plugins/wpcomsh/composer.lock index 4bfa7176f8498..de598c7715506 100644 --- a/projects/plugins/wpcomsh/composer.lock +++ b/projects/plugins/wpcomsh/composer.lock @@ -1705,7 +1705,7 @@ "dist": { "type": "path", "url": "../../packages/sync", - "reference": "9e674c384f72544b488e3af3d9348692d32cee54" + "reference": "2965d36db9a224b6e142e46c92358b353eca463a" }, "require": { "automattic/jetpack-connection": "@dev", @@ -1738,7 +1738,7 @@ "link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}" }, "branch-alias": { - "dev-trunk": "3.3.x-dev" + "dev-trunk": "3.4.x-dev" }, "dependencies": { "test-only": [ diff --git a/projects/plugins/wpcomsh/package.json b/projects/plugins/wpcomsh/package.json index b00ce4bb3e41e..98e5eb31aa329 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.0.3", + "version": "5.0.4-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 74f3ad7682830..43b478367c932 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.0.3 + * Version: 5.0.4-alpha * Author: Automattic * Author URI: http://automattic.com/ * * @package wpcomsh */ -define( 'WPCOMSH_VERSION', '5.0.3' ); +define( 'WPCOMSH_VERSION', '5.0.4-alpha' ); // If true, Typekit fonts will be available in addition to Google fonts add_filter( 'jetpack_fonts_enable_typekit', '__return_true' );