Skip to content

Commit

Permalink
Add full sync default modules list filter. (#39117)
Browse files Browse the repository at this point in the history
* Add default sync config filter.

* Add changelog entry.

* Add next version specifier.

Co-authored-by: Foteini Giannaropoulou <giannaropoulou.foteini@gmail.com>

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/10722256661

Upstream-Ref: Automattic/jetpack@19a104a
  • Loading branch information
kraftbj authored and matticbot committed Sep 5, 2024
1 parent 536174f commit f9fdd9b
Show file tree
Hide file tree
Showing 12 changed files with 145 additions and 130 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"automattic/jetpack-search": "^0.45.1-alpha",
"automattic/jetpack-stats": "^0.13.2-alpha",
"automattic/jetpack-status": "^3.3.4",
"automattic/jetpack-sync": "^3.9.1"
"automattic/jetpack-sync": "^3.10.0-alpha"
},
"require-dev": {
"automattic/jetpack-changelogger": "^4.2.6",
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"automattic/jetpack-constants": "^2.0.4",
"automattic/jetpack-plans": "^0.4.9",
"automattic/jetpack-status": "^3.3.4",
"automattic/jetpack-sync": "^3.9.1",
"automattic/jetpack-sync": "^3.10.0-alpha",
"automattic/jetpack-protect-status": "^0.1.4"
},
"require-dev": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"php": ">=7.0",
"automattic/jetpack-connection": "^3.0.0",
"automattic/jetpack-plugins-installer": "^0.4.2",
"automattic/jetpack-sync": "^3.9.1",
"automattic/jetpack-sync": "^3.10.0-alpha",
"automattic/jetpack-protect-models": "^0.2.1",
"automattic/jetpack-plans": "^0.4.9"
},
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-search/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"automattic/jetpack-status": "^3.3.4",
"automattic/jetpack-config": "^2.0.4",
"automattic/jetpack-my-jetpack": "^4.35.0",
"automattic/jetpack-sync": "^3.9.1"
"automattic/jetpack-sync": "^3.10.0-alpha"
},
"require-dev": {
"automattic/jetpack-changelogger": "^4.2.6",
Expand Down
8 changes: 8 additions & 0 deletions jetpack_vendor/automattic/jetpack-sync/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [3.10.0-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

### Added
- Sync: add a filter that allows modification of the default modules list used for full sync procedure.

## [3.9.1] - 2024-09-05
### Changed
- Optimized performance by moving the IDC safe mode check after the connection check, reducing unnecessary get_option() requests for jetpack_sync_error_idc [#39205]
Expand Down Expand Up @@ -1269,6 +1276,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Packages: Move sync to a classmapped package

[3.10.0-alpha]: https://github.com/Automattic/jetpack-sync/compare/v3.9.1...v3.10.0-alpha
[3.9.1]: https://github.com/Automattic/jetpack-sync/compare/v3.9.0...v3.9.1
[3.9.0]: https://github.com/Automattic/jetpack-sync/compare/v3.8.1...v3.9.0
[3.8.1]: https://github.com/Automattic/jetpack-sync/compare/v3.8.0...v3.8.1
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-sync/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"automattic/jetpack-changelogger": "^4.2.6",
"yoast/phpunit-polyfills": "^1.1.1",
"automattic/jetpack-search": "@dev",
"automattic/jetpack-waf": "@dev",
"automattic/jetpack-waf": "^0.18.5-alpha",
"automattic/wordbless": "@dev"
},
"suggest": {
Expand Down Expand Up @@ -50,7 +50,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
"dev-trunk": "3.9.x-dev"
"dev-trunk": "3.10.x-dev"
},
"dependencies": {
"test-only": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '3.9.1';
const PACKAGE_VERSION = '3.10.0-alpha';

const PACKAGE_SLUG = 'sync';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,14 @@ public function start( $full_sync_config = null ) {
$this->reset_data();

if ( ! is_array( $full_sync_config ) ) {
$full_sync_config = Defaults::$default_full_sync_config;
/*
* Filter default sync config to allow injecting custom configuration.
*
* @param array $full_sync_config Sync configuration for all sync modules.
*
* @since 3.10.0-alpha
*/
$full_sync_config = apply_filters( 'jetpack_full_sync_config', Defaults::$default_full_sync_config );
if ( is_multisite() ) {
$full_sync_config['network_options'] = 1;
}
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
),
'jetpack-sync' => array(
'path' => 'jetpack_vendor/automattic/jetpack-sync',
'ver' => '3.9.1',
'ver' => '3.10.0-alpha1725545957',
),
),
);
Loading

0 comments on commit f9fdd9b

Please sign in to comment.