@@ -245,74 +189,8 @@ const WithBackupsValueSection = props => {
);
};
-// DEPRECATED: this output was more confusing than helpful
-const NoBackupsValueSection = props => {
- const { data: backupStats, isLoading } = useSimpleQuery( {
- name: QUERY_BACKUP_STATS_KEY,
- query: {
- path: REST_API_COUNT_BACKUP_ITEMS_ENDPOINT,
- },
- } );
-
- const sortedStats = useMemo( () => {
- const data = [];
-
- if ( ! backupStats ) {
- return data;
- }
-
- Object.keys( backupStats ).forEach( key => {
- // We can safely filter out any values that are 0
- if ( backupStats[ key ] === 0 ) {
- return;
- }
-
- data.push( [ key, backupStats[ key ] ] );
- } );
-
- data.sort( ( a, b ) => {
- return a[ 1 ] < b[ 1 ] ? 1 : -1;
- } );
-
- return data;
- }, [ backupStats ] );
-
- return (
-
- );
-};
-
BackupCard.propTypes = {
admin: PropTypes.bool,
};
-NoBackupsValueSection.propTypes = {
- productData: PropTypes.object,
-};
-
export default BackupCard;
diff --git a/projects/packages/my-jetpack/_inc/components/product-cards-section/protect-card/use-protect-tooltip-copy.ts b/projects/packages/my-jetpack/_inc/components/product-cards-section/protect-card/use-protect-tooltip-copy.ts
index d79132a0945d9..45f7f150190f9 100644
--- a/projects/packages/my-jetpack/_inc/components/product-cards-section/protect-card/use-protect-tooltip-copy.ts
+++ b/projects/packages/my-jetpack/_inc/components/product-cards-section/protect-card/use-protect-tooltip-copy.ts
@@ -49,6 +49,7 @@ export function useProtectTooltipCopy(): TooltipContent {
jetpack_waf_automatic_rules: isAutoFirewallEnabled,
blocked_logins: blockedLoginsCount,
brute_force_protection: hasBruteForceProtection,
+ waf_supported: wafSupported,
} = wafData || {};
const pluginsCount = fromScanPlugins.length || Object.keys( plugins ).length;
@@ -246,21 +247,26 @@ export function useProtectTooltipCopy(): TooltipContent {
),
},
autoFirewallTooltip:
- hasProtectPaidPlan && ! isAutoFirewallEnabled
+ ( hasProtectPaidPlan && ! isAutoFirewallEnabled ) || ! wafSupported
? {
title: __( 'Auto-Firewall: Inactive', 'jetpack-my-jetpack' ),
- text: createInterpolateElement(
- __(
- 'You have Auto-Firewall disabled, visit your Protect
to activate.',
- 'jetpack-my-jetpack'
- ),
- {
- a: createElement( 'a', {
- href: settingsLink,
- onClick: trackFirewallSettingsLinkClick,
- } ),
- }
- ),
+ text: wafSupported
+ ? createInterpolateElement(
+ __(
+ 'You have Auto-Firewall disabled, visit your Protect
to activate.',
+ 'jetpack-my-jetpack'
+ ),
+ {
+ a: createElement( 'a', {
+ href: settingsLink,
+ onClick: trackFirewallSettingsLinkClick,
+ } ),
+ }
+ )
+ : __(
+ 'Auto-Firewall is disabled as your hosting provider already includes a built-in firewall with similar rules for your site.',
+ 'jetpack-my-jetpack'
+ ),
}
: {
title: __( 'Auto-Firewall: Inactive', 'jetpack-my-jetpack' ),
diff --git a/projects/packages/my-jetpack/_inc/data/constants.ts b/projects/packages/my-jetpack/_inc/data/constants.ts
index bf718b02dc97d..e0a87ed6f3520 100644
--- a/projects/packages/my-jetpack/_inc/data/constants.ts
+++ b/projects/packages/my-jetpack/_inc/data/constants.ts
@@ -4,7 +4,6 @@ const ODYSSEY_STATS_API_NAMESPACE = 'jetpack/v4/stats-app';
export const REST_API_SITE_PURCHASES_ENDPOINT = `${ REST_API_NAMESPACE }/site/purchases`;
export const REST_API_REWINDABLE_BACKUP_EVENTS_ENDPOINT = `${ REST_API_NAMESPACE }/site/backup/undo-event`;
-export const REST_API_COUNT_BACKUP_ITEMS_ENDPOINT = `${ REST_API_NAMESPACE }/site/backup/count-items`;
export const REST_API_CHAT_AVAILABILITY_ENDPOINT = `${ REST_API_NAMESPACE }/chat/availability`;
export const REST_API_CHAT_AUTHENTICATION_ENDPOINT = `${ REST_API_NAMESPACE }/chat/authentication`;
export const REST_API_SITE_PRODUCTS_ENDPOINT = `${ REST_API_NAMESPACE }/site/products`;
@@ -27,7 +26,6 @@ export const QUERY_LICENSES_KEY = 'available licenses';
export const QUERY_CHAT_AVAILABILITY_KEY = 'chat availability';
export const QUERY_CHAT_AUTHENTICATION_KEY = 'chat authentication';
export const QUERY_BACKUP_HISTORY_KEY = 'backup history';
-export const QUERY_BACKUP_STATS_KEY = 'backup stats';
export const QUERY_STATS_COUNTS_KEY = 'stats counts';
export const QUERY_DISMISS_WELCOME_BANNER_KEY = 'dismiss welcome banner';
export const QUERY_PURCHASES_KEY = 'purchases';
diff --git a/projects/packages/my-jetpack/global.d.ts b/projects/packages/my-jetpack/global.d.ts
index cc0373cc75204..a09edea1e2eab 100644
--- a/projects/packages/my-jetpack/global.d.ts
+++ b/projects/packages/my-jetpack/global.d.ts
@@ -47,7 +47,8 @@ type JetpackModule =
| 'complete'
| 'site-accelerator'
| 'newsletter'
- | 'related-posts';
+ | 'related-posts'
+ | 'brute-force';
type ThreatItem = {
// Protect API properties (free plan)
@@ -286,6 +287,7 @@ interface Window {
jetpack_waf_share_data: '1' | '';
jetpack_waf_share_debug_data: boolean;
standalone_mode: boolean;
+ waf_supported: boolean;
};
};
videopress: {
diff --git a/projects/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json
index 01d60e36a9bb5..9f957f3a2dfcc 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": "5.3.0",
+ "version": "5.3.2",
"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 ca643051fbe32..6efc68e8637d3 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 = '5.3.0';
+ const PACKAGE_VERSION = '5.3.2';
/**
* HTML container ID for the IDC screen on My Jetpack page.
@@ -236,9 +236,12 @@ public static function enqueue_scripts() {
$scan_data = Products\Protect::get_protect_data();
self::update_historically_active_jetpack_modules();
- $waf_config = array();
+ $waf_config = array();
+ $waf_supported = false;
+
if ( class_exists( 'Automattic\Jetpack\Waf\Waf_Runner' ) ) {
- $waf_config = Waf_Runner::get_config();
+ $waf_config = Waf_Runner::get_config();
+ $waf_supported = Waf_Runner::is_supported_environment();
}
wp_localize_script(
@@ -297,6 +300,9 @@ public static function enqueue_scripts() {
'scanData' => $scan_data,
'wafConfig' => array_merge(
$waf_config,
+ array(
+ 'waf_supported' => $waf_supported,
+ ),
array( 'blocked_logins' => (int) get_site_option( 'jetpack_protect_blocked_attempts', 0 ) )
),
),
diff --git a/projects/packages/my-jetpack/src/class-rest-product-data.php b/projects/packages/my-jetpack/src/class-rest-product-data.php
index 15530adb28174..f40a6439dbc3c 100644
--- a/projects/packages/my-jetpack/src/class-rest-product-data.php
+++ b/projects/packages/my-jetpack/src/class-rest-product-data.php
@@ -28,16 +28,6 @@ public function __construct() {
'permission_callback' => __CLASS__ . '::permissions_callback',
)
);
-
- register_rest_route(
- 'my-jetpack/v1',
- '/site/backup/count-items',
- array(
- 'methods' => \WP_REST_Server::READABLE,
- 'callback' => __CLASS__ . '::count_things_that_can_be_backed_up',
- 'permission_callback' => __CLASS__ . '::permissions_callback',
- )
- );
}
/**
@@ -109,39 +99,4 @@ public static function get_site_backup_undo_event() {
return rest_ensure_response( $undo_event );
}
-
- /**
- * This will collect a count of all the items that could be backed up
- * This is used to show what backup could be doing if it is not enabled
- *
- * @return WP_Error|\WP_REST_Response
- */
- public static function count_things_that_can_be_backed_up() {
- $image_mime_type = 'image';
- $video_mime_type = 'video';
- $audio_mime_type = 'audio';
-
- $data = array();
-
- // Add all post types together to get the total post count
- $data['total_post_count'] = array_sum( (array) wp_count_posts( 'post' ) );
-
- // Add all page types together to get the total page count
- $data['total_page_count'] = array_sum( (array) wp_count_posts( 'page' ) );
-
- // Add all comments together to get the total comment count
- $comments = (array) wp_count_comments();
- $data['total_comment_count'] = $comments ? $comments['total_comments'] : 0;
-
- // Add all image attachments together to get the total image count
- $data['total_image_count'] = array_sum( (array) wp_count_attachments( $image_mime_type ) );
-
- // Add all video attachments together to get the total video count
- $data['total_video_count'] = array_sum( (array) wp_count_attachments( $video_mime_type ) );
-
- // Add all audio attachments together to get the total audio count
- $data['total_audio_count'] = array_sum( (array) wp_count_attachments( $audio_mime_type ) );
-
- return rest_ensure_response( $data );
- }
}
diff --git a/projects/packages/my-jetpack/src/products/class-anti-spam.php b/projects/packages/my-jetpack/src/products/class-anti-spam.php
index c341a9f88d32d..7cec298d57aaf 100644
--- a/projects/packages/my-jetpack/src/products/class-anti-spam.php
+++ b/projects/packages/my-jetpack/src/products/class-anti-spam.php
@@ -128,20 +128,15 @@ public static function get_paid_plan_product_slugs() {
}
/**
- * Determine if the site has an Akismet plan.
+ * Check if the product has a free plan
+ * In this case we are only checking for an API key. The has_paid_plan_for_product will check to see if the specific site has a paid plan
*
- * @return bool - whether an API key was found
+ * @return bool
*/
- public static function has_paid_plan_for_product() {
- if ( parent::has_paid_plan_for_product() ) {
- return true;
- }
- // As a fallback, we're checking if the site has an API key for Akismet.
- // Note that some Akismet Plans are free - we're just checking for an API key and don't have the perspective of the plan attached to it here
+ public static function has_free_plan_for_product() {
$akismet_api_key = apply_filters( 'akismet_get_api_key', defined( 'WPCOM_API_KEY' ) ? constant( 'WPCOM_API_KEY' ) : get_option( 'wordpress_api_key' ) );
if ( ! empty( $akismet_api_key ) ) {
return true;
-
}
return false;
diff --git a/projects/packages/my-jetpack/src/products/class-product.php b/projects/packages/my-jetpack/src/products/class-product.php
index e8d2ca67cb7cd..5e747988fb8cf 100644
--- a/projects/packages/my-jetpack/src/products/class-product.php
+++ b/projects/packages/my-jetpack/src/products/class-product.php
@@ -643,7 +643,7 @@ public static function has_trial_support() {
* @return boolean
*/
public static function is_upgradable() {
- return false;
+ return ! static::has_paid_plan_for_product() && ! static::is_bundle_product();
}
/**
diff --git a/projects/packages/my-jetpack/tests/php/test-products-rest.php b/projects/packages/my-jetpack/tests/php/test-products-rest.php
index 821a6806ed7d7..1a3bf47c62d7e 100644
--- a/projects/packages/my-jetpack/tests/php/test-products-rest.php
+++ b/projects/packages/my-jetpack/tests/php/test-products-rest.php
@@ -201,7 +201,7 @@ public function test_activate_boost() {
$data = $response->get_data();
$this->assertEquals( 200, $response->get_status() );
- $this->assertEquals( 'active', $data['status'] );
+ $this->assertEquals( 'can_upgrade', $data['status'] );
$this->assertTrue( is_plugin_active( $this->boost_mock_filename ) );
}
diff --git a/projects/packages/phan-plugins/CHANGELOG.md b/projects/packages/phan-plugins/CHANGELOG.md
index b3bd1ef9122b5..daece31590858 100644
--- a/projects/packages/phan-plugins/CHANGELOG.md
+++ b/projects/packages/phan-plugins/CHANGELOG.md
@@ -5,9 +5,15 @@ 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).
+## [0.1.1] - 2025-01-09
+### Added
+- Enable test coverage. [#39961]
+
## 0.1.0 - 2024-08-29
### Added
- Initial version. [#37585]
### Changed
- Updated package dependencies. [#39004]
+
+[0.1.1]: https://github.com/Automattic/jetpack-phan-plugins/compare/v0.1.0...v0.1.1
diff --git a/projects/packages/phan-plugins/changelog/add-ci-php-8.4 b/projects/packages/phan-plugins/changelog/add-ci-php-8.4
deleted file mode 100644
index ddbb5f3179535..0000000000000
--- a/projects/packages/phan-plugins/changelog/add-ci-php-8.4
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Work around microsoft/tolerant-php-parser not being 8.4-safe yet in test
-
-
diff --git a/projects/packages/phan-plugins/changelog/restore-jp_test_coverage b/projects/packages/phan-plugins/changelog/restore-jp_test_coverage
deleted file mode 100644
index 7bb19dc79dd19..0000000000000
--- a/projects/packages/phan-plugins/changelog/restore-jp_test_coverage
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Enable test coverage.
diff --git a/projects/packages/phan-plugins/changelog/update-switch-to-raw-coverage-files b/projects/packages/phan-plugins/changelog/update-switch-to-raw-coverage-files
deleted file mode 100644
index bfd48f31ebc60..0000000000000
--- a/projects/packages/phan-plugins/changelog/update-switch-to-raw-coverage-files
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Generate raw phpunit and/or jest coverage data instead of clover.
-
-
diff --git a/projects/packages/phpcs-filter/CHANGELOG.md b/projects/packages/phpcs-filter/CHANGELOG.md
index 2a9961d988527..30766b5143102 100644
--- a/projects/packages/phpcs-filter/CHANGELOG.md
+++ b/projects/packages/phpcs-filter/CHANGELOG.md
@@ -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.0.0 - 2025-01-09
+### Added
+- Enable test coverage. [#39961]
+
+### Removed
+- General: Update minimum PHP version to 7.2. [#40147]
+
## 2.0.1 - 2024-08-29
### Added
- Add a doc note warning against using `
` when excluding individual sniff messages. [#37122]
diff --git a/projects/packages/phpcs-filter/changelog/add-phpunit-coverage-configs b/projects/packages/phpcs-filter/changelog/add-phpunit-coverage-configs
deleted file mode 100644
index 714f2593c8f4b..0000000000000
--- a/projects/packages/phpcs-filter/changelog/add-phpunit-coverage-configs
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Add missing files/dirs to phpunit coverage config.
-
-
diff --git a/projects/packages/phpcs-filter/changelog/restore-jp_test_coverage b/projects/packages/phpcs-filter/changelog/restore-jp_test_coverage
deleted file mode 100644
index 7bb19dc79dd19..0000000000000
--- a/projects/packages/phpcs-filter/changelog/restore-jp_test_coverage
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Enable test coverage.
diff --git a/projects/packages/phpcs-filter/changelog/update-bump_min_php_to_7.2 b/projects/packages/phpcs-filter/changelog/update-bump_min_php_to_7.2
deleted file mode 100644
index 712ab5f494aaa..0000000000000
--- a/projects/packages/phpcs-filter/changelog/update-bump_min_php_to_7.2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: major
-Type: removed
-
-General: Update minimum PHP version to 7.2.
diff --git a/projects/packages/phpcs-filter/changelog/update-switch-to-raw-coverage-files b/projects/packages/phpcs-filter/changelog/update-switch-to-raw-coverage-files
deleted file mode 100644
index bfd48f31ebc60..0000000000000
--- a/projects/packages/phpcs-filter/changelog/update-switch-to-raw-coverage-files
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Generate raw phpunit and/or jest coverage data instead of clover.
-
-
diff --git a/projects/packages/phpcs-filter/composer.json b/projects/packages/phpcs-filter/composer.json
index a0efd612a835a..f9e39c36b48bd 100644
--- a/projects/packages/phpcs-filter/composer.json
+++ b/projects/packages/phpcs-filter/composer.json
@@ -54,7 +54,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
- "dev-trunk": "2.0.x-dev"
+ "dev-trunk": "3.0.x-dev"
}
}
}
diff --git a/projects/packages/post-list/CHANGELOG.md b/projects/packages/post-list/CHANGELOG.md
index ca107904e5521..f1ab1c7685919 100644
--- a/projects/packages/post-list/CHANGELOG.md
+++ b/projects/packages/post-list/CHANGELOG.md
@@ -5,6 +5,10 @@ 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).
+## [0.7.3] - 2025-01-13
+### Fixed
+- Pages and Posts: Fix the layout on mobile when details are open. [#40872]
+
## [0.7.2] - 2024-12-16
### Changed
- Internal updates.
@@ -130,6 +134,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated the default columns displayed on the post and page list screens
- Refactored thumbnail preview to function server side. All javascript removed.
+[0.7.3]: https://github.com/automattic/jetpack-post-list/compare/v0.7.2...v0.7.3
[0.7.2]: https://github.com/automattic/jetpack-post-list/compare/v0.7.1...v0.7.2
[0.7.1]: https://github.com/automattic/jetpack-post-list/compare/v0.7.0...v0.7.1
[0.7.0]: https://github.com/automattic/jetpack-post-list/compare/v0.6.5...v0.7.0
diff --git a/projects/packages/post-list/src/class-post-list.php b/projects/packages/post-list/src/class-post-list.php
index d8eea02d1f6da..15d4193595a25 100644
--- a/projects/packages/post-list/src/class-post-list.php
+++ b/projects/packages/post-list/src/class-post-list.php
@@ -15,7 +15,7 @@
*/
class Post_List {
- const PACKAGE_VERSION = '0.7.2';
+ const PACKAGE_VERSION = '0.7.3';
const FEATURE = 'enhanced_post_list';
/**
diff --git a/projects/packages/post-list/src/style.css b/projects/packages/post-list/src/style.css
index 3db2622c18971..917f05df7cb1d 100644
--- a/projects/packages/post-list/src/style.css
+++ b/projects/packages/post-list/src/style.css
@@ -45,3 +45,13 @@ th.column-thumbnail + th a {
th.column-thumbnail.hidden + th a {
margin-left:0;
}
+
+@media screen and (max-width: 782px) {
+ /*
+ * Keep it as a table-cell.
+ * See https://github.com/WordPress/wordpress-develop/blob/4a9a928dbcd1c91d3633c8de51614dd90d8ea0ac/src/wp-admin/css/list-tables.css#L1969.
+ */
+ .wp-list-table .is-expanded td:not(.hidden).column-thumbnail {
+ display: table-cell !important;
+ }
+}
diff --git a/projects/packages/publicize/.phan/baseline.php b/projects/packages/publicize/.phan/baseline.php
index ae1e8cfe766d4..73ac3608fa9a5 100644
--- a/projects/packages/publicize/.phan/baseline.php
+++ b/projects/packages/publicize/.phan/baseline.php
@@ -17,6 +17,7 @@
// PhanPossiblyUndeclaredVariable : 2 occurrences
// PhanTypeMismatchReturnProbablyReal : 2 occurrences
// PhanTypeMissingReturn : 2 occurrences
+ // PhanUndeclaredClassMethod : 2 occurrences
// PhanImpossibleCondition : 1 occurrence
// PhanNoopNew : 1 occurrence
// PhanParamSignatureMismatch : 1 occurrence
@@ -28,17 +29,20 @@
// PhanTypeMismatchDefault : 1 occurrence
// PhanTypeMismatchDimFetch : 1 occurrence
// PhanTypeMismatchReturn : 1 occurrence
+ // PhanUndeclaredFunction : 1 occurrence
+ // PhanUndeclaredMethod : 1 occurrence
// Currently, file_suppressions and directory_suppressions are the only supported suppressions
'file_suppressions' => [
- 'src/class-connections-post-field.php' => ['PhanPluginDuplicateConditionalNullCoalescing'],
'src/class-keyring-helper.php' => ['PhanTypeMismatchArgumentProbablyReal', 'PhanTypeMismatchDefault'],
'src/class-publicize-base.php' => ['PhanImpossibleCondition', 'PhanPluginDuplicateConditionalNullCoalescing', 'PhanPluginSimplifyExpressionBool', 'PhanSuspiciousMagicConstant', 'PhanTypeMismatchArgument', 'PhanTypeMismatchArgumentNullable', 'PhanTypeMismatchArgumentNullableInternal', 'PhanTypeMismatchDimFetch', 'PhanTypeMismatchReturn'],
'src/class-publicize-setup.php' => ['PhanNoopNew', 'PhanTypeMismatchArgument'],
'src/class-publicize-ui.php' => ['PhanPluginDuplicateExpressionAssignmentOperation', 'PhanTypeMismatchReturnProbablyReal'],
'src/class-publicize.php' => ['PhanParamSignatureMismatch', 'PhanPossiblyUndeclaredVariable', 'PhanTypeMismatchArgument', 'PhanTypeMissingReturn'],
'src/class-rest-controller.php' => ['PhanPluginDuplicateConditionalNullCoalescing', 'PhanTypeMismatchReturnProbablyReal'],
- 'src/rest-api/class-connections-controller.php' => ['PhanPluginMixedKeyNoKey'],
+ 'src/rest-api/class-base-controller.php' => ['PhanUndeclaredClassMethod', 'PhanUndeclaredFunction'],
+ 'src/rest-api/class-connections-controller.php' => ['PhanPluginMixedKeyNoKey', 'PhanUndeclaredMethod'],
+ 'src/rest-api/class-connections-post-field.php' => ['PhanPluginDuplicateConditionalNullCoalescing'],
'src/social-image-generator/class-post-settings.php' => ['PhanPluginDuplicateConditionalNullCoalescing'],
'src/social-image-generator/class-rest-settings-controller.php' => ['PhanPluginMixedKeyNoKey'],
'src/social-image-generator/class-settings.php' => ['PhanPluginDuplicateConditionalNullCoalescing'],
diff --git a/projects/packages/publicize/CHANGELOG.md b/projects/packages/publicize/CHANGELOG.md
index 9022c932ada47..547957194bbe5 100644
--- a/projects/packages/publicize/CHANGELOG.md
+++ b/projects/packages/publicize/CHANGELOG.md
@@ -5,14 +5,25 @@ 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).
+## [0.57.3] - 2025-01-14
+### Fixed
+- Social: Fix failure on post save with LinkedIn connection enabled. [#41000]
+
+## [0.57.2] - 2025-01-13
+### Added
+- Publicize: Allow filtering of connections in publicize rest endpoint. [#40914]
+
+### Changed
+- Update connections post field rest endpoint to use the updated schema. [#40916]
+
## [0.57.1] - 2024-12-30
### Fixed
- Social: Ensure that broken connection notices work fine on WoA sites. [#40732]
## [0.57.0] - 2024-12-23
### Changed
-- Moved wpcom/v2/publicize/connections endpoint to publicize package. [#40607]
-- Script data: Don't call service endpoint on wpcom. [#40596]
+- Move wpcom/v2/publicize/connections endpoint to publicize package. [#40607]
+- Script data: Don't call service endpoint on WP.com. [#40596]
## [0.56.5] - 2024-12-16
### Changed
@@ -28,23 +39,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [0.56.2] - 2024-11-26
### Fixed
-- Fixed undefined index error on Atomic sites. [#40337]
+- Fix undefined index error on Atomic sites. [#40337]
## [0.56.1] - 2024-11-25
### Added
-- Added initial post share status to the initial state. [#40301]
+- Add initial post share status to the initial state. [#40301]
### Changed
- Updated package dependencies. [#40286] [#40288]
### Fixed
-- Fixed initial state error in the editor for Simple sites. [#40319]
+- Fix initial state error in the editor for Simple sites. [#40319]
- Fix page-detection util methods to stop unnecessary API calls to WordPress.com. [#40311]
-- Fixed call to undefined method on WordPress.com. [#40328]
+- Fix call to undefined method on WordPress.com. [#40328]
## [0.56.0] - 2024-11-18
### Added
-- Added a new toggle for UTM tracking [#39998]
+- Add a new toggle for UTM tracking. [#39998]
### Removed
- General: Update minimum PHP version to 7.2. [#40147]
@@ -796,6 +807,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated package dependencies.
- Update package.json metadata.
+[0.57.3]: https://github.com/Automattic/jetpack-publicize/compare/v0.57.2...v0.57.3
+[0.57.2]: https://github.com/Automattic/jetpack-publicize/compare/v0.57.1...v0.57.2
[0.57.1]: https://github.com/Automattic/jetpack-publicize/compare/v0.57.0...v0.57.1
[0.57.0]: https://github.com/Automattic/jetpack-publicize/compare/v0.56.5...v0.57.0
[0.56.5]: https://github.com/Automattic/jetpack-publicize/compare/v0.56.4...v0.56.5
diff --git a/projects/packages/publicize/package.json b/projects/packages/publicize/package.json
index 88fa5c4a11e07..f461892616b78 100644
--- a/projects/packages/publicize/package.json
+++ b/projects/packages/publicize/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-publicize",
- "version": "0.57.1",
+ "version": "0.57.3",
"description": "Publicize makes it easy to share your site’s posts on several social media networks automatically when you publish a new post.",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/publicize/#readme",
"bugs": {
diff --git a/projects/packages/publicize/src/class-publicize-base.php b/projects/packages/publicize/src/class-publicize-base.php
index c2e6c044cc5bf..076abd34acdc6 100644
--- a/projects/packages/publicize/src/class-publicize-base.php
+++ b/projects/packages/publicize/src/class-publicize-base.php
@@ -894,6 +894,7 @@ public function get_filtered_connection_data( $selected_post_id = null ) {
$post_id = null;
}
+ // TODO Get these services->connections from the cache populated from the REST API.
$services = $this->get_services( 'connected' );
$all_done = $this->post_is_done_sharing( $post_id );
@@ -1002,19 +1003,27 @@ public function get_filtered_connection_data( $selected_post_id = null ) {
}
$connection_list[] = array(
+ // REST Meta fields.
+ 'connection_id' => $connection_id,
+ 'display_name' => $this->get_display_name( $service_name, $connection ),
+ 'enabled' => $enabled,
+ 'external_handle' => $this->get_external_handle( $service_name, $connection ),
+ 'external_id' => $connection_meta['external_id'] ?? '',
+ 'profile_link' => (string) $this->get_profile_link( $service_name, $connection ),
+ 'profile_picture' => (string) $this->get_profile_picture( $connection ),
+ 'service_label' => static::get_service_label( $service_name ),
+ 'service_name' => $service_name,
+ 'shared' => ! $connection_data['user_id'],
+ 'status' => null,
+ 'user_id' => (int) $connection_data['user_id'],
+
+ // Deprecated fields.
'id' => $connection_id,
'unique_id' => $unique_id,
- 'service_name' => $service_name,
- 'service_label' => static::get_service_label( $service_name ),
- 'display_name' => $this->get_display_name( $service_name, $connection ),
'username' => $this->get_username( $service_name, $connection ),
- 'profile_picture' => $this->get_profile_picture( $connection ),
- 'enabled' => $enabled,
'done' => $done,
'toggleable' => $toggleable,
'global' => 0 == $connection_data['user_id'], // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual,WordPress.PHP.StrictComparisons.LooseComparison -- Other types can be used at times.
- 'external_id' => $connection_meta['external_id'] ?? '',
- 'user_id' => $connection_data['user_id'],
);
}
}
diff --git a/projects/packages/publicize/src/class-publicize-setup.php b/projects/packages/publicize/src/class-publicize-setup.php
index dc4dc5a3997c2..77a31cf3c72f9 100644
--- a/projects/packages/publicize/src/class-publicize-setup.php
+++ b/projects/packages/publicize/src/class-publicize-setup.php
@@ -7,7 +7,6 @@
namespace Automattic\Jetpack\Publicize;
-use Automattic\Jetpack\Publicize\REST_API\Connections_Controller;
use Automattic\Jetpack\Status\Host;
/**
@@ -40,7 +39,7 @@ public static function pre_initialization() {
Publicize_Assets::configure();
$rest_controllers = array(
- Connections_Controller::class,
+ REST_API\Connections_Controller::class,
);
// Load the REST controllers.
@@ -66,7 +65,7 @@ public static function on_jetpack_feature_publicize_enabled() {
// Adding on a higher priority to make sure we're the first field registered.
// The priority parameter can be removed once we deprecate WPCOM_REST_API_V2_Post_Publicize_Connections_Field
- add_action( 'rest_api_init', array( new Connections_Post_Field(), 'register_fields' ), 5 );
+ add_action( 'rest_api_init', array( new REST_API\Connections_Post_Field(), 'register_fields' ), 5 );
add_action( 'rest_api_init', array( new REST_Controller(), 'register_rest_routes' ) );
add_action( 'current_screen', array( static::class, 'init_sharing_limits' ) );
diff --git a/projects/packages/publicize/src/rest-api/class-base-controller.php b/projects/packages/publicize/src/rest-api/class-base-controller.php
index acf0aa0c78cc2..86ca5c8e40a52 100644
--- a/projects/packages/publicize/src/rest-api/class-base-controller.php
+++ b/projects/packages/publicize/src/rest-api/class-base-controller.php
@@ -18,6 +18,13 @@
*/
abstract class Base_Controller extends WP_REST_Controller {
+ /**
+ * Whether to allow requests as blog.
+ *
+ * @var bool
+ */
+ protected $allow_requests_as_blog = false;
+
/**
* Constructor.
*/
@@ -34,6 +41,22 @@ public static function is_wpcom() {
return ( new Host() )->is_wpcom_simple();
}
+ /**
+ * Check if the request is authorized for the blog.
+ *
+ * @return bool
+ */
+ protected static function is_authorized_blog_request() {
+ if ( self::is_wpcom() && is_jetpack_site( get_current_blog_id() ) ) {
+
+ $jp_auth_endpoint = new \WPCOM_REST_API_V2_Endpoint_Jetpack_Auth();
+
+ return $jp_auth_endpoint->is_jetpack_authorized_for_site() === true;
+ }
+
+ return false;
+ }
+
/**
* Filters out data based on ?_fields= request parameter
*
@@ -59,9 +82,11 @@ public function prepare_item_for_response( $item, $request ) {
/**
* Verify that user can access Publicize data
*
+ * @param WP_REST_Request $request Full details about the request.
* @return true|WP_Error
*/
- public function get_items_permission_check() {
+ public function get_items_permissions_check( $request ) {// phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+
global $publicize;
if ( ! $publicize ) {
@@ -72,6 +97,10 @@ public function get_items_permission_check() {
);
}
+ if ( $this->allow_requests_as_blog && self::is_authorized_blog_request() ) {
+ return true;
+ }
+
if ( $publicize->current_user_can_access_publicize_data() ) {
return true;
}
diff --git a/projects/packages/publicize/src/rest-api/class-connections-controller.php b/projects/packages/publicize/src/rest-api/class-connections-controller.php
index f1710bca05a93..f38c8e320cdb2 100644
--- a/projects/packages/publicize/src/rest-api/class-connections-controller.php
+++ b/projects/packages/publicize/src/rest-api/class-connections-controller.php
@@ -27,6 +27,8 @@ public function __construct() {
$this->namespace = 'wpcom/v2';
$this->rest_base = 'publicize/connections';
+ $this->allow_requests_as_blog = true;
+
add_action( 'rest_api_init', array( $this, 'register_routes' ) );
}
@@ -41,7 +43,7 @@ public function register_routes() {
array(
'methods' => WP_REST_Server::READABLE,
'callback' => array( $this, 'get_items' ),
- 'permission_callback' => array( $this, 'get_items_permission_check' ),
+ 'permission_callback' => array( $this, 'get_items_permissions_check' ),
'args' => array(
'test_connections' => array(
'type' => 'boolean',
@@ -104,56 +106,7 @@ public function get_item_schema() {
'type' => 'object',
'properties' => array_merge(
$deprecated_fields,
- array(
- 'connection_id' => array(
- 'type' => 'string',
- 'description' => __( 'Connection ID of the connected account.', 'jetpack-publicize-pkg' ),
- ),
- 'display_name' => array(
- 'type' => 'string',
- 'description' => __( 'Display name of the connected account.', 'jetpack-publicize-pkg' ),
- ),
- 'external_handle' => array(
- 'type' => 'string',
- 'description' => __( 'The external handle or username of the connected account.', 'jetpack-publicize-pkg' ),
- ),
- 'external_id' => array(
- 'type' => 'string',
- 'description' => __( 'The external ID of the connected account.', 'jetpack-publicize-pkg' ),
- ),
- 'profile_link' => array(
- 'type' => 'string',
- 'description' => __( 'Profile link of the connected account.', 'jetpack-publicize-pkg' ),
- ),
- 'profile_picture' => array(
- 'type' => 'string',
- 'description' => __( 'URL of the profile picture of the connected account.', 'jetpack-publicize-pkg' ),
- ),
- 'service_label' => array(
- 'type' => 'string',
- 'description' => __( 'Human-readable label for the Jetpack Social service.', 'jetpack-publicize-pkg' ),
- ),
- 'service_name' => array(
- 'type' => 'string',
- 'description' => __( 'Alphanumeric identifier for the Jetpack Social service.', 'jetpack-publicize-pkg' ),
- ),
- 'shared' => array(
- 'type' => 'boolean',
- 'description' => __( 'Whether the connection is shared with other users.', 'jetpack-publicize-pkg' ),
- ),
- 'status' => array(
- 'type' => 'string',
- 'description' => __( 'The connection status.', 'jetpack-publicize-pkg' ),
- 'enum' => array(
- 'ok',
- 'broken',
- ),
- ),
- 'user_id' => array(
- 'type' => 'integer',
- 'description' => __( 'ID of the user the connection belongs to.', 'jetpack-publicize-pkg' ),
- ),
- )
+ self::get_the_item_schema()
),
);
@@ -162,26 +115,93 @@ public function get_item_schema() {
return $this->add_additional_fields_schema( $schema );
}
+ /**
+ * Get the schema for the connection item.
+ *
+ * @return array
+ */
+ public static function get_the_item_schema() {
+ return array(
+ 'connection_id' => array(
+ 'type' => 'string',
+ 'description' => __( 'Connection ID of the connected account.', 'jetpack-publicize-pkg' ),
+ ),
+ 'display_name' => array(
+ 'type' => 'string',
+ 'description' => __( 'Display name of the connected account.', 'jetpack-publicize-pkg' ),
+ ),
+ 'external_handle' => array(
+ 'type' => 'string',
+ 'description' => __( 'The external handle or username of the connected account.', 'jetpack-publicize-pkg' ),
+ ),
+ 'external_id' => array(
+ 'type' => 'string',
+ 'description' => __( 'The external ID of the connected account.', 'jetpack-publicize-pkg' ),
+ ),
+ 'profile_link' => array(
+ 'type' => 'string',
+ 'description' => __( 'Profile link of the connected account.', 'jetpack-publicize-pkg' ),
+ ),
+ 'profile_picture' => array(
+ 'type' => 'string',
+ 'description' => __( 'URL of the profile picture of the connected account.', 'jetpack-publicize-pkg' ),
+ ),
+ 'service_label' => array(
+ 'type' => 'string',
+ 'description' => __( 'Human-readable label for the Jetpack Social service.', 'jetpack-publicize-pkg' ),
+ ),
+ 'service_name' => array(
+ 'type' => 'string',
+ 'description' => __( 'Alphanumeric identifier for the Jetpack Social service.', 'jetpack-publicize-pkg' ),
+ ),
+ 'shared' => array(
+ 'type' => 'boolean',
+ 'description' => __( 'Whether the connection is shared with other users.', 'jetpack-publicize-pkg' ),
+ ),
+ 'status' => array(
+ 'type' => 'string',
+ 'description' => __( 'The connection status.', 'jetpack-publicize-pkg' ),
+ 'enum' => array(
+ 'ok',
+ 'broken',
+ ),
+ ),
+ 'user_id' => array(
+ 'type' => 'integer',
+ 'description' => __( 'ID of the user the connection belongs to. It is the user ID on wordpress.com', 'jetpack-publicize-pkg' ),
+ ),
+ );
+ }
+
/**
* Get all connections. Meant to be called directly only on WPCOM.
*
- * @param bool $run_tests Whether to run tests on the connections.
+ * @param array $args Arguments
+ * - 'test_connections': bool Whether to run connection tests.
+ * - 'scope': enum('site', 'user') Which connections to include.
*
* @return array
*/
- protected static function get_all_connections( $run_tests = false ) {
+ protected static function get_all_connections( $args = array() ) {
/**
* Publicize instance.
- *
- * @var \Automattic\Jetpack\Publicize\Publicize $publicize
*/
global $publicize;
$items = array();
+ $run_tests = $args['test_connections'] ?? false;
+
$test_results = $run_tests ? self::get_connections_test_status() : array();
- foreach ( (array) $publicize->get_services( 'connected' ) as $service_name => $connections ) {
+ // If a (Jetpack) blog request, return all the connections for that site.
+ if ( self::is_authorized_blog_request() ) {
+ $service_connections = $publicize->get_all_connections_for_blog_id( get_current_blog_id() );
+ } else {
+ $service_connections = (array) $publicize->get_services( 'connected' );
+ }
+
+ foreach ( $service_connections as $service_name => $connections ) {
foreach ( $connections as $connection ) {
$connection_id = $publicize->get_connection_id( $connection );
@@ -190,13 +210,13 @@ protected static function get_all_connections( $run_tests = false ) {
$connection_data = $connection_meta['connection_data'];
$items[] = array(
- 'connection_id' => $connection_id,
- 'display_name' => $publicize->get_display_name( $service_name, $connection ),
- 'external_handle' => $publicize->get_external_handle( $service_name, $connection ),
+ 'connection_id' => (string) $connection_id,
+ 'display_name' => (string) $publicize->get_display_name( $service_name, $connection ),
+ 'external_handle' => (string) $publicize->get_external_handle( $service_name, $connection ),
'external_id' => $connection_meta['external_id'] ?? '',
- 'profile_link' => $publicize->get_profile_link( $service_name, $connection ),
- 'profile_picture' => $publicize->get_profile_picture( $connection ),
- 'service_label' => Publicize::get_service_label( $service_name ),
+ 'profile_link' => (string) $publicize->get_profile_link( $service_name, $connection ),
+ 'profile_picture' => (string) $publicize->get_profile_picture( $connection ),
+ 'service_label' => (string) Publicize::get_service_label( $service_name ),
'service_name' => $service_name,
'shared' => ! $connection_data['user_id'],
'status' => $test_results[ $connection_id ] ?? null,
@@ -219,13 +239,15 @@ protected static function get_all_connections( $run_tests = false ) {
/**
* Get a list of publicize connections.
*
- * @param bool $run_tests Whether to run tests on the connections.
+ * @param array $args Arguments.
+ *
+ * @see Automattic\Jetpack\Publicize\REST_API\Connections_Controller::get_all_connections()
*
* @return array
*/
- public static function get_connections( $run_tests = false ) {
+ public static function get_connections( $args = array() ) {
if ( self::is_wpcom() ) {
- return self::get_all_connections( $run_tests );
+ return self::get_all_connections( $args );
}
$site_id = Manager::get_site_id( true );
@@ -234,11 +256,17 @@ public static function get_connections( $run_tests = false ) {
}
$path = add_query_arg(
- array( 'test_connections' => $run_tests ),
+ array(
+ 'test_connections' => $args['test_connections'] ?? false,
+ ),
sprintf( '/sites/%d/publicize/connections', $site_id )
);
- $response = Client::wpcom_json_api_request_as_user( $path, 'v2', array( 'method' => 'GET' ) );
+ $blog_or_user = ( $args['scope'] ?? '' ) === 'site' ? 'blog' : 'user';
+
+ $callback = array( Client::class, "wpcom_json_api_request_as_{$blog_or_user}" );
+
+ $response = call_user_func( $callback, $path, 'v2', array( 'method' => 'GET' ), null, 'wpcom' );
if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
// TODO log error.
@@ -262,9 +290,12 @@ public static function get_connections( $run_tests = false ) {
public function get_items( $request ) {
$items = array();
- $run_tests = $request->get_param( 'test_connections' );
+ // On Jetpack, we don't want to pass the 'scope' param to get_connections().
+ $args = array(
+ 'test_connections' => $request->get_param( 'test_connections' ),
+ );
- foreach ( self::get_connections( $run_tests ) as $item ) {
+ foreach ( self::get_connections( $args ) as $item ) {
$data = $this->prepare_item_for_response( $item, $request );
$items[] = $this->prepare_response_for_collection( $data );
diff --git a/projects/packages/publicize/src/class-connections-post-field.php b/projects/packages/publicize/src/rest-api/class-connections-post-field.php
similarity index 84%
rename from projects/packages/publicize/src/class-connections-post-field.php
rename to projects/packages/publicize/src/rest-api/class-connections-post-field.php
index 6d632ee5ccbb3..a12047e30d912 100644
--- a/projects/packages/publicize/src/class-connections-post-field.php
+++ b/projects/packages/publicize/src/rest-api/class-connections-post-field.php
@@ -5,7 +5,7 @@
* @package automattic/jetpack-publicize
*/
-namespace Automattic\Jetpack\Publicize;
+namespace Automattic\Jetpack\Publicize\REST_API;
use WP_Error;
use WP_Post;
@@ -80,70 +80,46 @@ public function get_schema() {
* Schema for the endpoint.
*/
private function post_connection_schema() {
+ $connection_fields = Connections_Controller::get_the_item_schema();
+ $deprecated_fields = array(
+ 'id' => array(
+ 'type' => 'string',
+ 'description' => __( 'Unique identifier for the Jetpack Social connection.', 'jetpack-publicize-pkg' ) . ' ' . sprintf(
+ /* translators: %s is the new field name */
+ __( 'Deprecated in favor of %s.', 'jetpack-publicize-pkg' ),
+ 'connection_id'
+ ),
+ ),
+ 'username' => array(
+ 'type' => 'string',
+ 'description' => __( 'Username of the connected account.', 'jetpack-publicize-pkg' ) . ' ' . sprintf(
+ /* translators: %s is the new field name */
+ __( 'Deprecated in favor of %s.', 'jetpack-publicize-pkg' ),
+ 'external_handle'
+ ),
+ ),
+ 'can_disconnect' => array(
+ 'description' => __( 'Whether the current user can disconnect this connection.', 'jetpack-publicize-pkg' ) . ' ' . __( 'Deprecated.', 'jetpack-publicize-pkg' ),
+ 'type' => 'boolean',
+ 'context' => array( 'view', 'edit' ),
+ 'readonly' => true,
+ ),
+ );
+
return array(
'$schema' => 'http://json-schema.org/draft-04/schema#',
'title' => 'jetpack-publicize-post-connection',
'type' => 'object',
- 'properties' => array(
- 'id' => array(
- 'description' => __( 'Unique identifier for the Jetpack Social connection', 'jetpack-publicize-pkg' ),
- 'type' => 'string',
- 'context' => array( 'view', 'edit' ),
- 'readonly' => true,
- ),
- 'service_name' => array(
- 'description' => __( 'Alphanumeric identifier for the Jetpack Social service', 'jetpack-publicize-pkg' ),
- 'type' => 'string',
- 'context' => array( 'view', 'edit' ),
- 'readonly' => true,
- ),
- 'display_name' => array(
- 'description' => __( 'Display name of the connected account', 'jetpack-publicize-pkg' ),
- 'type' => 'string',
- 'context' => array( 'view', 'edit' ),
- 'readonly' => true,
- ),
- 'username' => array(
- 'description' => __( 'Username of the connected account', 'jetpack-publicize-pkg' ),
- 'type' => 'string',
- 'context' => array( 'view', 'edit' ),
- 'readonly' => true,
- ),
- 'profile_picture' => array(
- 'description' => __( 'Profile picture of the connected account', 'jetpack-publicize-pkg' ),
- 'type' => 'string',
- 'context' => array( 'edit' ),
- 'readonly' => true,
- ),
- 'enabled' => array(
- 'description' => __( 'Whether to share to this connection', 'jetpack-publicize-pkg' ),
- 'type' => 'boolean',
- 'context' => array( 'edit' ),
- ),
- 'done' => array(
- 'description' => __( 'Whether Jetpack Social has already finished sharing for this post', 'jetpack-publicize-pkg' ),
- 'type' => 'boolean',
- 'context' => array( 'edit' ),
- 'readonly' => true,
- ),
- 'toggleable' => array(
- 'description' => __( 'Whether `enable` can be changed for this post/connection', 'jetpack-publicize-pkg' ),
- 'type' => 'boolean',
- 'context' => array( 'edit' ),
- 'readonly' => true,
- ),
- 'external_id' => array(
- 'description' => __( 'The external ID of the connected account', 'jetpack-publicize-pkg' ),
- 'type' => 'string',
- 'context' => array( 'view', 'edit' ),
- 'readonly' => true,
- ),
- 'can_disconnect' => array(
- 'description' => __( 'Whether the current user can disconnect this connection', 'jetpack-publicize-pkg' ),
- 'type' => 'boolean',
- 'context' => array( 'view', 'edit' ),
- 'readonly' => true,
- ),
+ 'properties' => array_merge(
+ $deprecated_fields,
+ $connection_fields,
+ array(
+ 'enabled' => array(
+ 'description' => __( 'Whether to share to this connection.', 'jetpack-publicize-pkg' ),
+ 'type' => 'boolean',
+ 'context' => array( 'edit' ),
+ ),
+ )
),
);
}
@@ -212,11 +188,8 @@ public function get( $post_array, $field_name, $request, $object_type ) { // php
}
}
- $output_connection['id'] = (string) $connection['unique_id'];
- $output_connection['connection_id'] = (string) $connection['id'];
-
+ $output_connection['id'] = (string) $connection['unique_id'];
$output_connection['can_disconnect'] = current_user_can( 'edit_others_posts' ) || get_current_user_id() === (int) $connection['user_id'];
- $output_connection['shared'] = $connection['global'];
$output_connections[] = $output_connection;
}
diff --git a/projects/packages/publicize/tests/php/test-connections-post-field.php b/projects/packages/publicize/tests/php/test-connections-post-field.php
index b8cb6e23e7023..ee941918cc119 100644
--- a/projects/packages/publicize/tests/php/test-connections-post-field.php
+++ b/projects/packages/publicize/tests/php/test-connections-post-field.php
@@ -133,7 +133,7 @@ public function set_up() {
// Register REST routes.
$this->publicize->register_post_meta();
add_action( 'rest_api_init', array( new REST_Controller(), 'register_rest_routes' ), 4 );
- add_action( 'rest_api_init', array( new Connections_Post_Field(), 'register_fields' ), 5 );
+ add_action( 'rest_api_init', array( new REST_API\Connections_Post_Field(), 'register_fields' ), 5 );
do_action( 'rest_api_init' );
wp_set_current_user( $this->admin_id );
diff --git a/projects/plugins/crm/changelog/fix-phpunit_covers_warnings b/projects/packages/scheduled-updates/changelog/fix-scheduled-updates-coverage_warnings
similarity index 51%
rename from projects/plugins/crm/changelog/fix-phpunit_covers_warnings
rename to projects/packages/scheduled-updates/changelog/fix-scheduled-updates-coverage_warnings
index 9a705736d2ebc..a5b7c21cb2e72 100644
--- a/projects/plugins/crm/changelog/fix-phpunit_covers_warnings
+++ b/projects/packages/scheduled-updates/changelog/fix-scheduled-updates-coverage_warnings
@@ -1,4 +1,4 @@
Significance: patch
Type: fixed
-Fix PHPUnit coverage warnings.
+Code: Fix @covers annotations.
diff --git a/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-admin-test.php b/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-admin-test.php
index 86c2051995217..13080476b5c8c 100644
--- a/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-admin-test.php
+++ b/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-admin-test.php
@@ -10,7 +10,7 @@
/**
* Test class for Scheduled_Updates_Admin.
*
- * @coversDefaultClass Scheduled_Updates_Admin
+ * @coversDefaultClass Automattic\Jetpack\Scheduled_Updates_Admin
*/
class Scheduled_Updates_Admin_Test extends \WorDBless\BaseTestCase {
/**
diff --git a/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-health-paths-test.php b/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-health-paths-test.php
index 918615ed1dc8e..5b6b98b5b02af 100644
--- a/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-health-paths-test.php
+++ b/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-health-paths-test.php
@@ -11,7 +11,7 @@
/**
* Test class for Scheduled_Updates_Health_Paths.
*
- * @coversDefaultClass Scheduled_Updates_Health_Paths
+ * @coversDefaultClass Automattic\Jetpack\Scheduled_Updates_Health_Paths
*/
class Scheduled_Updates_Health_Paths_Test extends \WorDBless\BaseTestCase {
diff --git a/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-logs-test.php b/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-logs-test.php
index 766531cb1381a..93fded7805d70 100644
--- a/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-logs-test.php
+++ b/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-logs-test.php
@@ -10,7 +10,7 @@
/**
* Test class for Scheduled_Updates_Logs.
*
- * @coversDefaultClass Scheduled_Updates_Logs
+ * @coversDefaultClass Automattic\Jetpack\Scheduled_Updates_Logs
*/
class Scheduled_Updates_Logs_Test extends \WorDBless\BaseTestCase {
diff --git a/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-test.php b/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-test.php
index 443f9cc9ed14c..0dfbbc4975468 100644
--- a/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-test.php
+++ b/projects/packages/scheduled-updates/tests/php/class-scheduled-updates-test.php
@@ -10,7 +10,7 @@
/**
* Test class for Scheduled_Updates.
*
- * @coversDefaultClass Scheduled_Updates
+ * @coversDefaultClass Automattic\Jetpack\Scheduled_Updates
*/
class Scheduled_Updates_Test extends \WorDBless\BaseTestCase {
@@ -659,7 +659,7 @@ private function populate_file_with_plugin_header( $plugin_file, $plugin_name )
/**
* Test when all requested plugins are not installed.
*
- * @covers ::verify_plugins
+ * @covers WPCOM_REST_API_V2_Endpoint_Update_Schedules::validate_plugins_param
*/
public function test_verify_plugins_not_installed() {
$plugins = array( 'not-installed-plugin-1/not-installed-plugin-1.php', 'not-installed-plugin-2/not-installed-plugin-2.php' );
@@ -686,7 +686,7 @@ public function test_verify_plugins_not_installed() {
/**
* Test when all requested plugins are managed.
*
- * @covers ::verify_plugins
+ * @covers WPCOM_REST_API_V2_Endpoint_Update_Schedules::validate_plugins_param
*/
public function test_verify_plugins_all_managed() {
$plugins = array( 'managed-plugin-1/managed-plugin-1.php', 'managed-plugin-2/managed-plugin-2.php' );
@@ -713,7 +713,7 @@ public function test_verify_plugins_all_managed() {
/**
* Test when one requested plugin is installed and not managed, and another is installed but managed.
*
- * @covers ::verify_plugins
+ * @covers WPCOM_REST_API_V2_Endpoint_Update_Schedules::validate_plugins_param
*/
public function test_verify_plugins_installed_mixed() {
$plugins = array( 'managed-plugin/managed-plugin.php', 'installed-plugin/installed-plugin.php' );
diff --git a/projects/packages/scheduled-updates/tests/php/class-wpcom-rest-api-v2-endpoint-update-schedules-active-test.php b/projects/packages/scheduled-updates/tests/php/class-wpcom-rest-api-v2-endpoint-update-schedules-active-test.php
index 52e61bb5aec00..63afe14864870 100644
--- a/projects/packages/scheduled-updates/tests/php/class-wpcom-rest-api-v2-endpoint-update-schedules-active-test.php
+++ b/projects/packages/scheduled-updates/tests/php/class-wpcom-rest-api-v2-endpoint-update-schedules-active-test.php
@@ -91,7 +91,7 @@ public function tear_down() {
/**
* Test update_item.
*
- * @covers update_item
+ * @covers ::update_item
*/
public function test_active_is_true_by_default() {
$plugins = array( 'gutenberg/gutenberg.php' );
@@ -124,7 +124,7 @@ public function test_active_is_true_by_default() {
/**
* Test update_item.
*
- * @covers update_item
+ * @covers ::update_item
*/
public function test_set_active_false_update_active_flag() {
$plugins = array(
@@ -179,7 +179,7 @@ public function test_set_active_false_update_active_flag() {
/**
* Test update_item.
*
- * @covers update_item
+ * @covers ::update_item
*/
public function test_run_inactive_schedule() {
$plugins = array(
@@ -217,7 +217,7 @@ public function test_run_inactive_schedule() {
/**
* Test update_item.
*
- * @covers update_item
+ * @covers ::update_item
*/
public function test_run_active_schedule() {
$plugins = array( 'gutenberg/gutenberg.php' );
@@ -251,7 +251,7 @@ public function test_run_active_schedule() {
/**
* Test update_item update cron.
*
- * @covers update_item
+ * @covers ::update_item
*/
public function test_set_active_false_update_sync_option() {
$plugins = array(
diff --git a/projects/packages/scheduled-updates/tests/php/class-wpcom-rest-api-v2-endpoint-update-schedules-test.php b/projects/packages/scheduled-updates/tests/php/class-wpcom-rest-api-v2-endpoint-update-schedules-test.php
index 2381dcecae470..f3cafd5c8e99b 100644
--- a/projects/packages/scheduled-updates/tests/php/class-wpcom-rest-api-v2-endpoint-update-schedules-test.php
+++ b/projects/packages/scheduled-updates/tests/php/class-wpcom-rest-api-v2-endpoint-update-schedules-test.php
@@ -385,7 +385,7 @@ public function test_updating_autoupdate_plugins_on_create() {
/**
* Can't have more than two schedules.
*
- * @covers ::create
+ * @covers ::create_item
*/
public function test_empty_last_run() {
$plugins = array( 'gutenberg/gutenberg.php' );
diff --git a/projects/packages/sync/CHANGELOG.md b/projects/packages/sync/CHANGELOG.md
index e34df7d0cfa36..35e317486a9e4 100644
--- a/projects/packages/sync/CHANGELOG.md
+++ b/projects/packages/sync/CHANGELOG.md
@@ -5,6 +5,10 @@ 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).
+## [4.3.0] - 2025-01-09
+### Added
+- Instant Search: add taxonomies for a8c-support-theme kb_article cpt. [#38660]
+
## [4.2.0] - 2024-12-23
### Added
- Sync:Add specific key for full sync actions [#40566]
@@ -1363,6 +1367,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Packages: Move sync to a classmapped package
+[4.3.0]: https://github.com/Automattic/jetpack-sync/compare/v4.2.0...v4.3.0
[4.2.0]: https://github.com/Automattic/jetpack-sync/compare/v4.1.1...v4.2.0
[4.1.1]: https://github.com/Automattic/jetpack-sync/compare/v4.1.0...v4.1.1
[4.1.0]: https://github.com/Automattic/jetpack-sync/compare/v4.0.2...v4.1.0
diff --git a/projects/packages/sync/changelog/update-class-search-taxonomies-kb-article b/projects/packages/sync/changelog/update-class-search-taxonomies-kb-article
deleted file mode 100644
index f73fd274cec7b..0000000000000
--- a/projects/packages/sync/changelog/update-class-search-taxonomies-kb-article
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Instant Search: add taxonomies for a8c-support-theme kb_article cpt.
diff --git a/projects/packages/sync/composer.json b/projects/packages/sync/composer.json
index eaf2a91548582..65e577e38f32f 100644
--- a/projects/packages/sync/composer.json
+++ b/projects/packages/sync/composer.json
@@ -62,7 +62,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "4.2.x-dev"
+ "dev-trunk": "4.3.x-dev"
},
"dependencies": {
"test-only": [
diff --git a/projects/packages/sync/src/class-package-version.php b/projects/packages/sync/src/class-package-version.php
index 9f356e4a48a78..3d9b7ffd3a052 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 = '4.2.0';
+ const PACKAGE_VERSION = '4.3.0';
const PACKAGE_SLUG = 'sync';
diff --git a/projects/packages/transport-helper/CHANGELOG.md b/projects/packages/transport-helper/CHANGELOG.md
index c4615ebeec0e7..ae8baa2954f92 100644
--- a/projects/packages/transport-helper/CHANGELOG.md
+++ b/projects/packages/transport-helper/CHANGELOG.md
@@ -5,6 +5,17 @@ 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).
+## [0.3.0] - 2025-01-09
+### Added
+- Enable test coverage. [#39961]
+
+### Changed
+- Backup: Added next daily backup schedule time on admin page. [#39914]
+- Updated dependencies. [#40286]
+
+### Removed
+- General: Update minimum PHP version to 7.2. [#40147]
+
## [0.2.6] - 2024-10-29
### Changed
- Internal updates. [#39781]
@@ -75,6 +86,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Updated package dependencies.
+[0.3.0]: https://github.com/Automattic/jetpack-transport-helper/compare/v0.2.6...v0.3.0
[0.2.6]: https://github.com/Automattic/jetpack-transport-helper/compare/v0.2.5...v0.2.6
[0.2.5]: https://github.com/Automattic/jetpack-transport-helper/compare/v0.2.4...v0.2.5
[0.2.4]: https://github.com/Automattic/jetpack-transport-helper/compare/v0.2.3...v0.2.4
diff --git a/projects/packages/transport-helper/changelog/add-jetpack-backup-schedule-time b/projects/packages/transport-helper/changelog/add-jetpack-backup-schedule-time
deleted file mode 100644
index 798d9040ba827..0000000000000
--- a/projects/packages/transport-helper/changelog/add-jetpack-backup-schedule-time
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Backup: added next daily backup schedule time on admin page
diff --git a/projects/packages/transport-helper/changelog/fix-bump_composer_versions b/projects/packages/transport-helper/changelog/fix-bump_composer_versions
deleted file mode 100644
index 13cbf3392f78d..0000000000000
--- a/projects/packages/transport-helper/changelog/fix-bump_composer_versions
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated dependencies.
diff --git a/projects/packages/transport-helper/changelog/restore-jp_test_coverage b/projects/packages/transport-helper/changelog/restore-jp_test_coverage
deleted file mode 100644
index 7bb19dc79dd19..0000000000000
--- a/projects/packages/transport-helper/changelog/restore-jp_test_coverage
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Enable test coverage.
diff --git a/projects/packages/transport-helper/changelog/update-bump_min_php_to_7.2 b/projects/packages/transport-helper/changelog/update-bump_min_php_to_7.2
deleted file mode 100644
index 712ab5f494aaa..0000000000000
--- a/projects/packages/transport-helper/changelog/update-bump_min_php_to_7.2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: major
-Type: removed
-
-General: Update minimum PHP version to 7.2.
diff --git a/projects/packages/transport-helper/changelog/update-switch-to-raw-coverage-files b/projects/packages/transport-helper/changelog/update-switch-to-raw-coverage-files
deleted file mode 100644
index bfd48f31ebc60..0000000000000
--- a/projects/packages/transport-helper/changelog/update-switch-to-raw-coverage-files
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Generate raw phpunit and/or jest coverage data instead of clover.
-
-
diff --git a/projects/packages/transport-helper/composer.json b/projects/packages/transport-helper/composer.json
index a3a313859aaaf..92f8aa50695cc 100644
--- a/projects/packages/transport-helper/composer.json
+++ b/projects/packages/transport-helper/composer.json
@@ -60,7 +60,7 @@
},
"autotagger": true,
"branch-alias": {
- "dev-trunk": "0.2.x-dev"
+ "dev-trunk": "0.3.x-dev"
},
"textdomain": "jetpack-transport-helper"
},
diff --git a/projects/packages/transport-helper/package.json b/projects/packages/transport-helper/package.json
index d425739101614..485f78455209e 100644
--- a/projects/packages/transport-helper/package.json
+++ b/projects/packages/transport-helper/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-transport-helper",
- "version": "0.2.6",
+ "version": "0.3.0",
"description": "Package to help transport server communication",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/transport-helper/#readme",
"bugs": {
diff --git a/projects/packages/transport-helper/src/class-package-version.php b/projects/packages/transport-helper/src/class-package-version.php
index 8b0fe301b8ec2..049172db391e8 100644
--- a/projects/packages/transport-helper/src/class-package-version.php
+++ b/projects/packages/transport-helper/src/class-package-version.php
@@ -16,7 +16,7 @@
*/
class Package_Version {
- const PACKAGE_VERSION = '0.2.6';
+ const PACKAGE_VERSION = '0.3.0';
const PACKAGE_SLUG = 'transport-helper';
diff --git a/projects/packages/woocommerce-analytics/CHANGELOG.md b/projects/packages/woocommerce-analytics/CHANGELOG.md
index 34193fea647ae..d434ee4a08099 100644
--- a/projects/packages/woocommerce-analytics/CHANGELOG.md
+++ b/projects/packages/woocommerce-analytics/CHANGELOG.md
@@ -5,6 +5,10 @@ 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).
+## [0.4.1] - 2025-01-09
+### Fixed
+- Temporarily disable setcookie to avoid caching issues. [#40937]
+
## [0.4.0] - 2025-01-06
### Added
- Add Search Event & landing Page support. [#40698]
@@ -83,6 +87,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fix namespace issue with WooCommerce class reference. [#35857]
- General: bail early when WooCommerce is not active. [#36278]
+[0.4.2]: https://github.com/Automattic/woocommerce-analytics/compare/v0.4.1...v0.4.2
+[0.4.1]: https://github.com/Automattic/woocommerce-analytics/compare/v0.4.0...v0.4.1
[0.4.0]: https://github.com/Automattic/woocommerce-analytics/compare/v0.3.1...v0.4.0
[0.3.1]: https://github.com/Automattic/woocommerce-analytics/compare/v0.3.0...v0.3.1
[0.3.0]: https://github.com/Automattic/woocommerce-analytics/compare/v0.2.0...v0.3.0
diff --git a/projects/packages/woocommerce-analytics/src/class-universal.php b/projects/packages/woocommerce-analytics/src/class-universal.php
index 35a9ef63390a6..439806ad4e851 100644
--- a/projects/packages/woocommerce-analytics/src/class-universal.php
+++ b/projects/packages/woocommerce-analytics/src/class-universal.php
@@ -82,21 +82,24 @@ public function initialize_woocommerceanalytics_session() {
$session_id = wp_generate_uuid4();
$this->session_id = $session_id;
$this->landing_page = sanitize_url( wp_unslash( ( empty( $_SERVER['HTTPS'] ) ? 'http' : 'https' ) . "://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]" ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotValidatedNotSanitized -- actually escaped with sanitize_url.
- setcookie(
- 'woocommerceanalytics_session',
- wp_json_encode(
- array(
- 'session_id' => $this->session_id,
- 'landing_page' => $this->landing_page,
- )
- ),
- 0,
- COOKIEPATH,
- COOKIE_DOMAIN,
- is_ssl(),
- true
- );
- $this->record_event( 'woocommerceanalytics_session_started' );
+ // Disabled the below temporarily to avoid caching issues.
+ // phpcs:disable Squiz.PHP.CommentedOutCode.Found
+ // setcookie(
+ // 'woocommerceanalytics_session',
+ // wp_json_encode(
+ // array(
+ // 'session_id' => $this->session_id,
+ // 'landing_page' => $this->landing_page,
+ // )
+ // ),
+ // 0,
+ // COOKIEPATH,
+ // COOKIE_DOMAIN,
+ // is_ssl(),
+ // true
+ // );
+ // $this->record_event( 'woocommerceanalytics_session_started' );
+ // phpcs:enable Squiz.PHP.CommentedOutCode.Found
}
}
diff --git a/projects/packages/woocommerce-analytics/src/class-woo-analytics-trait.php b/projects/packages/woocommerce-analytics/src/class-woo-analytics-trait.php
index 7e6d3c96b22b8..474ab420dc0ca 100644
--- a/projects/packages/woocommerce-analytics/src/class-woo-analytics-trait.php
+++ b/projects/packages/woocommerce-analytics/src/class-woo-analytics-trait.php
@@ -263,16 +263,19 @@ public function find_cart_checkout_content_sources() {
* @return array Array of standard event props.
*/
public function get_common_properties() {
- $session_data = json_decode( sanitize_text_field( wp_unslash( $_COOKIE['woocommerceanalytics_session'] ?? '' ) ), true ) ?? array();
- $session_id = sanitize_text_field( $session_data['session_id'] ?? $this->session_id );
- $landing_page = sanitize_url( $session_data['landing_page'] ?? $this->landing_page );
+ // phpcs:disable Squiz.PHP.CommentedOutCode.Found
+ // Disabled the below temporarily to avoid caching issues.
+ // $session_data = json_decode( sanitize_text_field( wp_unslash( $_COOKIE['woocommerceanalytics_session'] ?? '' ) ), true ) ?? array();
+ // $session_id = sanitize_text_field( $session_data['session_id'] ?? $this->session_id );
+ // $landing_page = sanitize_url( $session_data['landing_page'] ?? $this->landing_page );
+ // phpcs:enable Squiz.PHP.CommentedOutCode.Found
$site_info = array(
- 'session_id' => $session_id,
+ 'session_id' => null,
'blog_id' => Jetpack_Connection::get_site_id(),
'store_id' => defined( '\\WC_Install::STORE_ID_OPTION' ) ? get_option( \WC_Install::STORE_ID_OPTION ) : false,
'ui' => $this->get_user_id(),
'url' => home_url(),
- 'landing_page' => $landing_page,
+ 'landing_page' => null,
'woo_version' => WC()->version,
'wp_version' => get_bloginfo( 'version' ),
'store_admin' => in_array( array( 'administrator', 'shop_manager' ), wp_get_current_user()->roles, true ) ? 1 : 0,
diff --git a/projects/packages/woocommerce-analytics/src/class-woocommerce-analytics.php b/projects/packages/woocommerce-analytics/src/class-woocommerce-analytics.php
index ce14a813278d4..6fd9295a75fd1 100644
--- a/projects/packages/woocommerce-analytics/src/class-woocommerce-analytics.php
+++ b/projects/packages/woocommerce-analytics/src/class-woocommerce-analytics.php
@@ -19,7 +19,7 @@ class Woocommerce_Analytics {
/**
* Package version.
*/
- const PACKAGE_VERSION = '0.4.0';
+ const PACKAGE_VERSION = '0.4.1';
/**
* Initializer.
diff --git a/projects/plugins/automattic-for-agencies-client/CHANGELOG.md b/projects/plugins/automattic-for-agencies-client/CHANGELOG.md
index 1a7ede7096ac7..c7a38bfeaf865 100644
--- a/projects/plugins/automattic-for-agencies-client/CHANGELOG.md
+++ b/projects/plugins/automattic-for-agencies-client/CHANGELOG.md
@@ -5,46 +5,42 @@ 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).
+## 0.4.0 - 2025-01-09
+### Changed
+- Updated dependencies. [#40286]
+- Updated package dependencies. [#40116] [#40258] [#40288] [#40363] [#40515] [#40564] [#40693] [#40792] [#40815]
+
+### Removed
+- General: Update minimum PHP version to 7.2. [#40147]
+- General: Update minimum WordPress version to 6.6. [#40146]
+
+### Fixed
+- E2E Tests: Only install single browser used by Playwright. [#40827]
+
## 0.3.0 - 2024-11-11
### Added
- Enable test coverage. [#39961]
### Changed
-- General: indicate compatibility with the upcoming version of WordPress - 6.6. [#37962]
-- General: indicate compatibility with the upcoming version of WordPress - 6.7. [#39786]
+- General: Indicate compatibility with the upcoming version of WordPress - 6.6. [#37962]
+- General: Indicate compatibility with the upcoming version of WordPress - 6.7. [#39786]
- Only include `wp-polyfill` as a script dependency when needed. [#39629]
-- Updated package dependencies. [#38132]
-- Updated package dependencies. [#38228]
-- Updated package dependencies. [#38235]
-- Updated package dependencies. [#38662]
-- Updated package dependencies. [#38822]
-- Updated package dependencies. [#39004]
-- Updated package dependencies. [#39111]
-- Updated package dependencies. [#39176]
-- Updated package dependencies. [#39278]
-- Updated package dependencies. [#39288]
-- Updated package dependencies. [#39302]
-- Updated package dependencies. [#39332]
-- Updated package dependencies. [#39594]
-- Updated package dependencies. [#39653]
-- Updated package dependencies. [#39707]
-- Updated package dependencies. [#39999]
-- Updated package dependencies. [#40060]
+- Updated package dependencies. [#38132] [#38228] [#38235] [#38662] [#38822] [#39004] [#39111] [#39176] [#39278] [#39288] [#39302] [#39332] [#39594] [#39653] [#39707] [#39999] [#40060]
### Removed
- Connection: Removed deprecated method features_available [#39442]
- Connection: Removed features_enabled deprecated method [#39475]
-- General: update WordPress version requirements to WordPress 6.5. [#38382]
+- General: Update WordPress version requirements to WordPress 6.5. [#38382]
### Fixed
- Lossless image optimization of images in projects/plugins [subdirectories from a* through social] [#38573]
## 0.2.1 - 2024-06-12
### Changed
-- Dashboard: switch to a smaller and faster dependency (`clsx`) to handle class names. [#37708]
-- Dashboard: update the connection screen's messaging to make our Terms of Service clearer. [#37536]
-- Dependencies: remove the 'jetpack-identity-crisis' dependency. [#36968]
-- Dependencies: update multiple dependencies. [#37669], [#37767], [#37776], [#37796]
+- Dashboard: Switch to a smaller and faster dependency (`clsx`) to handle class names. [#37708]
+- Dashboard: Update the connection screen's messaging to make our Terms of Service clearer. [#37536]
+- Dependencies: Remove the 'jetpack-identity-crisis' dependency. [#36968]
+- Dependencies: Update multiple dependencies. [#37669] [#37767] [#37776] [#37796]
## 0.2.0 - 2024-05-28
### Added
@@ -72,10 +68,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- General: update WordPress version requirements to WordPress 6.4. [#37047]
- General: use wp_admin_notice function introduced in WP 6.4 to display notices. [#37051]
- Updated details about sharing data with WordPress.com [#37039]
-- Updated package dependencies. [#36585]
-- Updated package dependencies. [#36760]
-- Updated package dependencies. [#36775]
-- Updated package dependencies. [#36788]
+- Updated package dependencies. [#36585] [#36760] [#36775] [#36788]
### Removed
- Removed the Jetpack-branded header and footer from the plugin. [#36930]
diff --git a/projects/plugins/automattic-for-agencies-client/automattic-for-agencies-client.php b/projects/plugins/automattic-for-agencies-client/automattic-for-agencies-client.php
index dbfda1ad822a5..376c956ceeafa 100644
--- a/projects/plugins/automattic-for-agencies-client/automattic-for-agencies-client.php
+++ b/projects/plugins/automattic-for-agencies-client/automattic-for-agencies-client.php
@@ -4,7 +4,7 @@
* Plugin Name: Automattic for Agencies Client
* Plugin URI: https://wordpress.org/plugins/automattic-for-agencies-client
* Description: Securely connect your clients’ sites to the Automattic for Agencies Sites Dashboard. Manage your sites from one place and see what needs attention.
- * Version: 0.3.0
+ * Version: 0.4.0
* Author: Automattic
* Author URI: https://automattic.com/for-agencies/
* License: GPLv2 or later
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/add-ci-always-process-coverage b/projects/plugins/automattic-for-agencies-client/changelog/add-ci-always-process-coverage
deleted file mode 100644
index 387ca599c4182..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/add-ci-always-process-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Always run JS coverage, even if PHP coverage fails.
-
-
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/fix-bump_composer_versions b/projects/plugins/automattic-for-agencies-client/changelog/fix-bump_composer_versions
deleted file mode 100644
index 13cbf3392f78d..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/fix-bump_composer_versions
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated dependencies.
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/fix-playwright_install_tweaks b/projects/plugins/automattic-for-agencies-client/changelog/fix-playwright_install_tweaks
deleted file mode 100644
index ebeba9b69f473..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/fix-playwright_install_tweaks
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-E2E Tests: Only install single browser used by Playwright.
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/prerelease#3 b/projects/plugins/automattic-for-agencies-client/changelog/prerelease#3
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/prerelease#3
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/renovate-automattic-color-studio-4.x b/projects/plugins/automattic-for-agencies-client/changelog/renovate-automattic-color-studio-4.x
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/renovate-automattic-color-studio-4.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/renovate-brain-monkey-2.x b/projects/plugins/automattic-for-agencies-client/changelog/renovate-brain-monkey-2.x
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/renovate-brain-monkey-2.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/renovate-brain-monkey-2.x#2 b/projects/plugins/automattic-for-agencies-client/changelog/renovate-brain-monkey-2.x#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/renovate-brain-monkey-2.x#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/renovate-config-3.x b/projects/plugins/automattic-for-agencies-client/changelog/renovate-config-3.x
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/renovate-config-3.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/renovate-lock-file-maintenance#6 b/projects/plugins/automattic-for-agencies-client/changelog/renovate-lock-file-maintenance#6
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/renovate-lock-file-maintenance#6
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/renovate-lock-file-maintenance#7 b/projects/plugins/automattic-for-agencies-client/changelog/renovate-lock-file-maintenance#7
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/renovate-lock-file-maintenance#7
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/renovate-playwright-monorepo b/projects/plugins/automattic-for-agencies-client/changelog/renovate-playwright-monorepo
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/renovate-playwright-monorepo
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/renovate-wordpress-monorepo b/projects/plugins/automattic-for-agencies-client/changelog/renovate-wordpress-monorepo
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/renovate-wordpress-monorepo
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/renovate-wordpress-monorepo#2 b/projects/plugins/automattic-for-agencies-client/changelog/renovate-wordpress-monorepo#2
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/renovate-wordpress-monorepo#2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/renovate-wordpress-monorepo#3 b/projects/plugins/automattic-for-agencies-client/changelog/renovate-wordpress-monorepo#3
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/renovate-wordpress-monorepo#3
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/update-bump_min_php_to_7.2 b/projects/plugins/automattic-for-agencies-client/changelog/update-bump_min_php_to_7.2
deleted file mode 100644
index 712ab5f494aaa..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/update-bump_min_php_to_7.2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: major
-Type: removed
-
-General: Update minimum PHP version to 7.2.
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/update-bump_min_php_to_7.2#2 b/projects/plugins/automattic-for-agencies-client/changelog/update-bump_min_php_to_7.2#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/update-bump_min_php_to_7.2#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/update-bump_min_wp_to_6.6 b/projects/plugins/automattic-for-agencies-client/changelog/update-bump_min_wp_to_6.6
deleted file mode 100644
index b5daa14e55bc4..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/update-bump_min_wp_to_6.6
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: major
-Type: removed
-
-General: Update minimum WordPress version to 6.6.
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/update-composer b/projects/plugins/automattic-for-agencies-client/changelog/update-composer
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/update-composer
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/update-eslint-9 b/projects/plugins/automattic-for-agencies-client/changelog/update-eslint-9
deleted file mode 100644
index 1cb10572ab69e..0000000000000
--- a/projects/plugins/automattic-for-agencies-client/changelog/update-eslint-9
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Update eslint config for eslint 9.
-
-
diff --git a/projects/plugins/automattic-for-agencies-client/composer.json b/projects/plugins/automattic-for-agencies-client/composer.json
index 4ac8a22093967..8c30216789f5f 100644
--- a/projects/plugins/automattic-for-agencies-client/composer.json
+++ b/projects/plugins/automattic-for-agencies-client/composer.json
@@ -77,6 +77,6 @@
"automattic/jetpack-autoloader": true,
"automattic/jetpack-composer-plugin": true
},
- "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_automattic_for_agencies_clientⓥ0_3_0"
+ "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_automattic_for_agencies_clientⓥ0_4_0"
}
}
diff --git a/projects/plugins/automattic-for-agencies-client/composer.lock b/projects/plugins/automattic-for-agencies-client/composer.lock
index 11c16d2a78dc8..3803293918ae3 100644
--- a/projects/plugins/automattic-for-agencies-client/composer.lock
+++ b/projects/plugins/automattic-for-agencies-client/composer.lock
@@ -905,7 +905,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "ece2cb5be16c8bc399fb6681a61ffa42b42e3cf5"
+ "reference": "9f24b0cb0912e1e3f235e946b9f397ffd9e36ccf"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -938,7 +938,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "4.2.x-dev"
+ "dev-trunk": "4.3.x-dev"
},
"dependencies": {
"test-only": [
@@ -981,16 +981,16 @@
"packages-dev": [
{
"name": "antecedent/patchwork",
- "version": "2.2.0",
+ "version": "2.2.1",
"source": {
"type": "git",
"url": "https://github.com/antecedent/patchwork.git",
- "reference": "b07d4fb37c3c723c8755122160c089e077d5de65"
+ "reference": "1bf183a3e1bd094f231a2128b9ecc5363c269245"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/antecedent/patchwork/zipball/b07d4fb37c3c723c8755122160c089e077d5de65",
- "reference": "b07d4fb37c3c723c8755122160c089e077d5de65",
+ "url": "https://api.github.com/repos/antecedent/patchwork/zipball/1bf183a3e1bd094f231a2128b9ecc5363c269245",
+ "reference": "1bf183a3e1bd094f231a2128b9ecc5363c269245",
"shasum": ""
},
"require": {
@@ -1023,9 +1023,9 @@
],
"support": {
"issues": "https://github.com/antecedent/patchwork/issues",
- "source": "https://github.com/antecedent/patchwork/tree/2.2.0"
+ "source": "https://github.com/antecedent/patchwork/tree/2.2.1"
},
- "time": "2024-09-27T16:59:55+00:00"
+ "time": "2024-12-11T10:19:54+00:00"
},
{
"name": "automattic/jetpack-changelogger",
@@ -1485,16 +1485,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.1",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
"shasum": ""
},
"require": {
@@ -1537,9 +1537,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
},
- "time": "2024-10-08T18:51:32+00:00"
+ "time": "2024-12-30T11:07:19+00:00"
},
{
"name": "phar-io/manifest",
@@ -3283,16 +3283,16 @@
},
{
"name": "symfony/console",
- "version": "v7.2.0",
+ "version": "v7.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf"
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
+ "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
"shasum": ""
},
"require": {
@@ -3356,7 +3356,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.2.0"
+ "source": "https://github.com/symfony/console/tree/v7.2.1"
},
"funding": [
{
@@ -3372,7 +3372,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-06T14:24:19+00:00"
+ "time": "2024-12-11T03:49:26+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -3393,12 +3393,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -3705,8 +3705,8 @@
"type": "library",
"extra": {
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -3844,12 +3844,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4042,16 +4042,16 @@
},
{
"name": "yoast/phpunit-polyfills",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be"
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
+ "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
"shasum": ""
},
"require": {
@@ -4101,7 +4101,7 @@
"security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
"source": "https://github.com/Yoast/PHPUnit-Polyfills"
},
- "time": "2024-09-06T22:03:10+00:00"
+ "time": "2025-01-08T16:58:34+00:00"
}
],
"aliases": [],
diff --git a/projects/plugins/automattic-for-agencies-client/readme.txt b/projects/plugins/automattic-for-agencies-client/readme.txt
index a804af627e859..b60857a50affc 100644
--- a/projects/plugins/automattic-for-agencies-client/readme.txt
+++ b/projects/plugins/automattic-for-agencies-client/readme.txt
@@ -44,17 +44,23 @@ Once connected, your site will display within Automattic for Agencies.
1. Manage your connection to the agency dashboard from the Settings screen in your WordPress dashboard.
== Changelog ==
-### 0.3.0 - 2024-11-11
+### 0.4.0 - 2025-01-09
#### Changed
-- General: indicate compatibility with the upcoming version of WordPress - 6.7.
-- Only include `wp-polyfill` as a script dependency when needed.
+- Updated dependencies.
+- Updated package dependencies.
+- Updated package dependencies.
+- Updated package dependencies.
+- Updated package dependencies.
+- Updated package dependencies.
+- Updated package dependencies.
+- Updated package dependencies.
+- Updated package dependencies.
- Updated package dependencies.
#### Removed
-- Connection: Removed deprecated method features_available
-- Connection: Removed features_enabled deprecated method
-- General: update WordPress version requirements to WordPress 6.5.
+- General: Update minimum PHP version to 7.2.
+- General: Update minimum WordPress version to 6.6.
#### Fixed
-- Lossless image optimization of images
+- E2E Tests: Only install single browser used by Playwright.
diff --git a/projects/plugins/backup/CHANGELOG.md b/projects/plugins/backup/CHANGELOG.md
index 27678b1d1cd8c..e18c5e526dc49 100644
--- a/projects/plugins/backup/CHANGELOG.md
+++ b/projects/plugins/backup/CHANGELOG.md
@@ -4,6 +4,14 @@ 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/).
+## [3.1] - 2025-01-10
+### Changed
+- Resolve an issue where revoked licenses were incorrectly treated as unattached. This caused users to be redirected to the license activation page after site connection, even when unattached licenses were not valid for activation. [#40215]
+- Social: Change My Jetpack CTA for Social from "Learn more" to "Activate". [#40359]
+- Update backup plugin screenshots [#40386]
+- Updated dependencies. [#40286]
+- Updated package dependencies. [#40515]
+
## [3.0] - 2024-11-14
### Added
- Display next scheduled daily backup time on the admin page.
@@ -255,6 +263,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Use `absoluteRuntime` in babel JS build to avoid module not found errors.
[2.2-beta]: https://github.com/Automattic/jetpack-backup-plugin/compare/2.1...2.2-beta
+[3.1]: https://github.com/Automattic/jetpack-backup-plugin/compare/3.0...3.1
[3.0]: https://github.com/Automattic/jetpack-backup-plugin/compare/2.9...3.0
[2.9]: https://github.com/Automattic/jetpack-backup-plugin/compare/2.8...2.9
[2.8]: https://github.com/Automattic/jetpack-backup-plugin/compare/2.7...2.8
diff --git a/projects/plugins/backup/changelog/fix-bump_composer_versions b/projects/plugins/backup/changelog/fix-bump_composer_versions
deleted file mode 100644
index 13cbf3392f78d..0000000000000
--- a/projects/plugins/backup/changelog/fix-bump_composer_versions
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated dependencies.
diff --git a/projects/plugins/backup/changelog/fix-bump_composer_versions_round2#2 b/projects/plugins/backup/changelog/fix-bump_composer_versions_round2#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/backup/changelog/fix-bump_composer_versions_round2#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/backup/changelog/prerelease b/projects/plugins/backup/changelog/prerelease
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/backup/changelog/prerelease
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/backup/changelog/prerelease#2 b/projects/plugins/backup/changelog/prerelease#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/backup/changelog/prerelease#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/backup/changelog/prerelease#3 b/projects/plugins/backup/changelog/prerelease#3
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/backup/changelog/prerelease#3
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/backup/changelog/prerelease#4 b/projects/plugins/backup/changelog/prerelease#4
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/backup/changelog/prerelease#4
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/backup/changelog/prerelease#5 b/projects/plugins/backup/changelog/prerelease#5
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/backup/changelog/prerelease#5
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/backup/changelog/renovate-brain-monkey-2.x b/projects/plugins/backup/changelog/renovate-brain-monkey-2.x
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/backup/changelog/renovate-brain-monkey-2.x
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/backup/changelog/update-backup-plugin-screenshots b/projects/plugins/backup/changelog/update-backup-plugin-screenshots
deleted file mode 100644
index 44fa71bbec4d9..0000000000000
--- a/projects/plugins/backup/changelog/update-backup-plugin-screenshots
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated backup plugin screenshots
diff --git a/projects/plugins/backup/changelog/update-composer b/projects/plugins/backup/changelog/update-composer
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/backup/changelog/update-composer
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/backup/changelog/update-eslint-9 b/projects/plugins/backup/changelog/update-eslint-9
deleted file mode 100644
index 1cb10572ab69e..0000000000000
--- a/projects/plugins/backup/changelog/update-eslint-9
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Update eslint config for eslint 9.
-
-
diff --git a/projects/plugins/backup/changelog/update-fetch-available-licenses b/projects/plugins/backup/changelog/update-fetch-available-licenses
deleted file mode 100644
index 3c349c8b1445e..0000000000000
--- a/projects/plugins/backup/changelog/update-fetch-available-licenses
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Resolved an issue where revoked licenses were incorrectly treated as unattached. This caused users to be redirected to the license activation page after site connection, even when unattached licenses were not valid for activation.
diff --git a/projects/plugins/backup/changelog/update-my-jetpack-social-cta b/projects/plugins/backup/changelog/update-my-jetpack-social-cta
deleted file mode 100644
index 6b1daf9c1b05e..0000000000000
--- a/projects/plugins/backup/changelog/update-my-jetpack-social-cta
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Social | Changed My Jetpack CTA for Social from "Learn more" to "Activate"
diff --git a/projects/plugins/backup/composer.json b/projects/plugins/backup/composer.json
index 85a968f326bdc..3b71d89a18de9 100644
--- a/projects/plugins/backup/composer.json
+++ b/projects/plugins/backup/composer.json
@@ -34,7 +34,7 @@
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
- "autoloader-suffix": "9559eef123208b7d1b9c15b978567267_backupⓥ3_0",
+ "autoloader-suffix": "9559eef123208b7d1b9c15b978567267_backupⓥ3_1",
"allow-plugins": {
"automattic/jetpack-autoloader": true,
"automattic/jetpack-composer-plugin": true
diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock
index 89ab9018ca367..17bbd5a32a9dd 100644
--- a/projects/plugins/backup/composer.lock
+++ b/projects/plugins/backup/composer.lock
@@ -1822,7 +1822,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "ece2cb5be16c8bc399fb6681a61ffa42b42e3cf5"
+ "reference": "9f24b0cb0912e1e3f235e946b9f397ffd9e36ccf"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -1855,7 +1855,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "4.2.x-dev"
+ "dev-trunk": "4.3.x-dev"
},
"dependencies": {
"test-only": [
@@ -2105,16 +2105,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.1",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
"shasum": ""
},
"require": {
@@ -2157,9 +2157,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
},
- "time": "2024-10-08T18:51:32+00:00"
+ "time": "2024-12-30T11:07:19+00:00"
},
{
"name": "phar-io/manifest",
@@ -3719,16 +3719,16 @@
},
{
"name": "symfony/console",
- "version": "v7.2.0",
+ "version": "v7.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf"
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
+ "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
"shasum": ""
},
"require": {
@@ -3792,7 +3792,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.2.0"
+ "source": "https://github.com/symfony/console/tree/v7.2.1"
},
"funding": [
{
@@ -3808,7 +3808,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-06T14:24:19+00:00"
+ "time": "2024-12-11T03:49:26+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -3829,12 +3829,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4141,8 +4141,8 @@
"type": "library",
"extra": {
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -4280,12 +4280,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4478,16 +4478,16 @@
},
{
"name": "yoast/phpunit-polyfills",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be"
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
+ "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
"shasum": ""
},
"require": {
@@ -4537,7 +4537,7 @@
"security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
"source": "https://github.com/Yoast/PHPUnit-Polyfills"
},
- "time": "2024-09-06T22:03:10+00:00"
+ "time": "2025-01-08T16:58:34+00:00"
}
],
"aliases": [],
diff --git a/projects/plugins/backup/jetpack-backup.php b/projects/plugins/backup/jetpack-backup.php
index 76cb6ad76b9e7..2983fb75f2039 100644
--- a/projects/plugins/backup/jetpack-backup.php
+++ b/projects/plugins/backup/jetpack-backup.php
@@ -4,7 +4,7 @@
* Plugin Name: Jetpack VaultPress Backup
* Plugin URI: https://jetpack.com/jetpack-backup
* Description: Easily restore or download a backup of your site from a specific moment in time.
- * Version: 3.0
+ * Version: 3.1
* Author: Automattic - Jetpack Backup team
* Author URI: https://jetpack.com/
* License: GPLv2 or later
diff --git a/projects/plugins/backup/readme.txt b/projects/plugins/backup/readme.txt
index b150b57f94db3..1c747fbd739a7 100644
--- a/projects/plugins/backup/readme.txt
+++ b/projects/plugins/backup/readme.txt
@@ -175,18 +175,13 @@ No, Jetpack VaultPress Backup does not currently support split site or split hom
2. Your site backups are stored in multiple locations on our world-class cloud infrastructure so you can recover them at any moment.
== Changelog ==
-### 3.0 - 2024-11-14
-#### Added
-- Display next scheduled daily backup time on the admin page.
-
+### 3.1 - 2025-01-10
#### Changed
-- Exclude discarded backups from being counted as successful on the admin page.
-- General: Indicate compatibility with WordPress version 6.7.
+- Resolve an issue where revoked licenses were incorrectly treated as unattached. This caused users to be redirected to the license activation page after site connection, even when unattached licenses were not valid for activation.
+- Social: Change My Jetpack CTA for Social from "Learn more" to "Activate".
+- Update backup plugin screenshots
+- Updated dependencies.
- Updated package dependencies.
-- Various internal updates and improvements.
-
-#### Fixed
-- Resolved an issue on the pricing page where the loading placeholder remained visible after the price loaded.
--------
diff --git a/projects/plugins/boost/.gitattributes b/projects/plugins/boost/.gitattributes
index a1ec69d2c57d0..54a7bd6d71d6b 100644
--- a/projects/plugins/boost/.gitattributes
+++ b/projects/plugins/boost/.gitattributes
@@ -13,7 +13,6 @@ vendor/automattic/** production-include
vendor/composer/** production-include
vendor/jetpack-autoloader/** production-include
vendor/tedivm/** production-include
-vendor/tubalmartin/** production-include
vendor/matthiasmullie/** production-include
vendor/wikimedia/aho-corasick/** production-include
diff --git a/projects/plugins/boost/.phan/baseline.php b/projects/plugins/boost/.phan/baseline.php
index 507c6915ac89a..c009f71b48236 100644
--- a/projects/plugins/boost/.phan/baseline.php
+++ b/projects/plugins/boost/.phan/baseline.php
@@ -14,8 +14,8 @@
// PhanTypeArraySuspicious : 9 occurrences
// PhanTypeMismatchArgument : 8 occurrences
// PhanParamTooMany : 6 occurrences
- // PhanPossiblyUndeclaredVariable : 6 occurrences
- // PhanTypeMismatchReturnProbablyReal : 6 occurrences
+ // PhanPossiblyUndeclaredVariable : 5 occurrences
+ // PhanTypeMismatchReturnProbablyReal : 5 occurrences
// PhanUndeclaredConstant : 5 occurrences
// PhanTypeMismatchArgumentNullableInternal : 4 occurrences
// PhanUndeclaredFunction : 4 occurrences
@@ -30,7 +30,6 @@
// PhanTypeMismatchReturnNullable : 2 occurrences
// PhanCoalescingNeverNull : 1 occurrence
// PhanImpossibleTypeComparisonInGlobalScope : 1 occurrence
- // PhanPluginNeverReturnFunction : 1 occurrence
// PhanRedefineFunction : 1 occurrence
// PhanRedundantCondition : 1 occurrence
// PhanTypeInvalidUnaryOperandIncOrDec : 1 occurrence
@@ -55,13 +54,12 @@
'app/lib/minify/Config.php' => ['PhanTypeMismatchReturnNullable'],
'app/lib/minify/Dependency_Path_Mapping.php' => ['PhanUndeclaredConstant'],
'app/lib/minify/functions-helpers.php' => ['PhanImpossibleTypeComparison', 'PhanTypeMismatchArgumentNullableInternal', 'PhanTypeMismatchDefault', 'PhanUndeclaredClassMethod', 'PhanUndeclaredClassReference', 'PhanUndeclaredConstant'],
- 'app/lib/minify/functions-service.php' => ['PhanImpossibleTypeComparison', 'PhanPluginDuplicateConditionalNullCoalescing', 'PhanPluginNeverReturnFunction', 'PhanPluginUseReturnValueInternalKnown', 'PhanPossiblyUndeclaredVariable', 'PhanTypeComparisonToArray', 'PhanTypeMismatchArgumentInternal', 'PhanTypeMismatchArgumentNullableInternal'],
+ 'app/lib/minify/functions-service.php' => ['PhanImpossibleTypeComparison', 'PhanPluginDuplicateConditionalNullCoalescing', 'PhanPluginUseReturnValueInternalKnown', 'PhanPossiblyUndeclaredVariable', 'PhanTypeComparisonToArray', 'PhanTypeMismatchArgumentInternal', 'PhanTypeMismatchArgumentNullableInternal'],
'app/modules/Modules_Setup.php' => ['PhanTypeMismatchPropertyDefault'],
'app/modules/image-guide/Image_Guide_Proxy.php' => ['PhanPluginDuplicateConditionalNullCoalescing'],
'app/modules/image-size-analysis/data-sync/Image_Size_Analysis_Action_Fix.php' => ['PhanPossiblyUndeclaredVariable', 'PhanRedundantCondition'],
'app/modules/optimizations/critical-css/CSS_Proxy.php' => ['PhanPluginDuplicateConditionalNullCoalescing'],
'app/modules/optimizations/page-cache/Page_Cache_Setup.php' => ['PhanTypeMismatchArgument', 'PhanTypeMismatchReturnProbablyReal', 'PhanTypeMissingReturn'],
- 'app/modules/optimizations/page-cache/data-sync/Page_Cache_Entry.php' => ['PhanTypeMismatchReturnProbablyReal'],
'app/modules/optimizations/page-cache/pre-wordpress/Boost_Cache.php' => ['PhanTypeMismatchReturnProbablyReal'],
'app/modules/optimizations/page-cache/pre-wordpress/Logger.php' => ['PhanCoalescingNeverNull', 'PhanPluginDuplicateConditionalNullCoalescing'],
'app/modules/optimizations/page-cache/pre-wordpress/Request.php' => ['PhanPluginDuplicateConditionalNullCoalescing', 'PhanTypeMismatchPropertyDefault'],
diff --git a/projects/plugins/boost/app/lib/Environment_Change_Detector.php b/projects/plugins/boost/app/lib/Environment_Change_Detector.php
index 0eca32a5992b2..ee77a9954332a 100644
--- a/projects/plugins/boost/app/lib/Environment_Change_Detector.php
+++ b/projects/plugins/boost/app/lib/Environment_Change_Detector.php
@@ -79,6 +79,8 @@ public static function get_available_env_change_statuses() {
self::ENV_CHANGE_POST_SAVED,
self::ENV_CHANGE_SWITCHED_THEME,
self::ENV_CHANGE_PLUGIN_CHANGE,
+ self::ENV_CHANGE_CORNERSTONE_PAGE_SAVED,
+ self::ENV_CHANGE_CORNERSTONE_PAGES_LIST_UPDATED,
);
}
diff --git a/projects/plugins/boost/app/lib/class-minify.php b/projects/plugins/boost/app/lib/class-minify.php
index 8608e4af4341d..73cde2f7f1cd4 100644
--- a/projects/plugins/boost/app/lib/class-minify.php
+++ b/projects/plugins/boost/app/lib/class-minify.php
@@ -9,19 +9,14 @@
namespace Automattic\Jetpack_Boost\Lib;
+use MatthiasMullie\Minify\CSS as CSSMinifier;
use MatthiasMullie\Minify\JS as JSMinifier;
-use tubalmartin\CssMin\Minifier as CSSMinifier;
/**
* Class Minify
*/
class Minify {
- /**
- * @var CSSMinifier - Holds the CssMin\Minifier instance, for reuse on subsequent calls.
- */
- private static $css_minifier;
-
/**
* Strips whitespace from JavaScript scripts.
*
@@ -44,10 +39,13 @@ public static function js( $js ) {
* Minifies the supplied CSS code, returning its minified form.
*/
public static function css( $css ) {
- if ( ! self::$css_minifier ) {
- self::$css_minifier = new CSSMinifier();
+ try {
+ $minifier = new CSSMinifier( $css );
+ $minified_css = $minifier->minify();
+ } catch ( \Exception $e ) {
+ return $css;
}
- return self::$css_minifier->run( $css );
+ return $minified_css;
}
}
diff --git a/projects/plugins/boost/app/lib/minify/functions-service.php b/projects/plugins/boost/app/lib/minify/functions-service.php
index 08fbd8997447d..68c11a2e695ac 100644
--- a/projects/plugins/boost/app/lib/minify/functions-service.php
+++ b/projects/plugins/boost/app/lib/minify/functions-service.php
@@ -323,9 +323,16 @@ function jetpack_boost_page_optimize_get_file_paths( $args ) {
return $args;
}
+/**
+ * Exit with a given HTTP status code.
+ *
+ * @param int $status HTTP status code.
+ *
+ * @return never
+ */
function jetpack_boost_page_optimize_status_exit( $status ) {
http_response_code( $status );
- exit;
+ exit( 0 ); // This is a workaround, until a bug in phan is fixed - https://github.com/phan/phan/issues/4888
}
function jetpack_boost_page_optimize_get_mime_type( $file ) {
diff --git a/projects/plugins/boost/app/modules/optimizations/page-cache/data-sync/Page_Cache_Entry.php b/projects/plugins/boost/app/modules/optimizations/page-cache/data-sync/Page_Cache_Entry.php
index 4e25efb74c161..fb7538916e3f6 100644
--- a/projects/plugins/boost/app/modules/optimizations/page-cache/data-sync/Page_Cache_Entry.php
+++ b/projects/plugins/boost/app/modules/optimizations/page-cache/data-sync/Page_Cache_Entry.php
@@ -31,7 +31,7 @@ public function set( $value ) {
*
* @param mixed $value The value to sanitize.
*
- * @return string The sanitized value, as a list.
+ * @return array The sanitized value.
*/
private function sanitize_value( $value ) {
if ( is_array( $value ) ) {
@@ -56,12 +56,19 @@ private function sanitize_value( $value ) {
// Remove double shashes.
$path = str_replace( '//', '/', $path );
+ // Remove symbols, as they are included in the regex check.
+ $path = ltrim( $path, '^' );
+ $path = rtrim( $path, '$' );
+ $path = preg_replace( '/\/\?$/', '', $path );
+
// Make sure there's a leading slash.
$path = '/' . ltrim( $path, '/' );
// Fix up any wildcards.
$path = $this->sanitize_wildcards( $path );
}
+
+ $value = array_values( array_unique( array_filter( $value ) ) );
} else {
$value = array();
}
diff --git a/projects/plugins/boost/app/modules/optimizations/page-cache/pre-wordpress/Boost_Cache.php b/projects/plugins/boost/app/modules/optimizations/page-cache/pre-wordpress/Boost_Cache.php
index edf3b948f0924..6e9fdd2fa4780 100644
--- a/projects/plugins/boost/app/modules/optimizations/page-cache/pre-wordpress/Boost_Cache.php
+++ b/projects/plugins/boost/app/modules/optimizations/page-cache/pre-wordpress/Boost_Cache.php
@@ -81,6 +81,13 @@ public function init_actions() {
add_action( 'wp_trash_post', array( $this, 'delete_on_post_trash' ), 10, 2 );
add_filter( 'wp_php_error_message', array( $this, 'disable_caching_on_error' ) );
add_filter( 'init', array( $this, 'init_do_cache' ) );
+ $this->load_extra();
+ }
+
+ private function load_extra() {
+ if ( file_exists( WP_CONTENT_DIR . '/boost-cache-extra.php' ) ) {
+ include_once WP_CONTENT_DIR . '/boost-cache-extra.php';
+ }
}
/**
diff --git a/projects/plugins/boost/app/modules/optimizations/page-cache/pre-wordpress/Request.php b/projects/plugins/boost/app/modules/optimizations/page-cache/pre-wordpress/Request.php
index 540c481946ca7..d94eefb8eeac2 100644
--- a/projects/plugins/boost/app/modules/optimizations/page-cache/pre-wordpress/Request.php
+++ b/projects/plugins/boost/app/modules/optimizations/page-cache/pre-wordpress/Request.php
@@ -95,6 +95,8 @@ public function is_url_excluded( $request_uri = '' ) {
/**
* Filters the bypass patterns for the page cache.
+ * If you need to sanitize them, do it before passing them to this filter,
+ * as there's no sanitization done after this filter.
*
* @since 3.2.0
*
@@ -104,7 +106,7 @@ public function is_url_excluded( $request_uri = '' ) {
$bypass_patterns[] = 'wp-.*\.php';
foreach ( $bypass_patterns as $expr ) {
- if ( ! empty( $expr ) && preg_match( "~$expr~", $request_uri ) ) {
+ if ( ! empty( $expr ) && preg_match( "~^$expr/?$~", $request_uri ) ) {
return true;
}
}
diff --git a/projects/plugins/boost/changelog/add-boost-extra-code-loader b/projects/plugins/boost/changelog/add-boost-extra-code-loader
new file mode 100644
index 0000000000000..8620b717449e9
--- /dev/null
+++ b/projects/plugins/boost/changelog/add-boost-extra-code-loader
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Cache: added extra PHP file the site owner can use to modify how the cache works.
diff --git a/projects/plugins/boost/changelog/add-cornerstone-to-site-health b/projects/plugins/boost/changelog/add-cornerstone-to-site-health
new file mode 100644
index 0000000000000..e36af1941bc0b
--- /dev/null
+++ b/projects/plugins/boost/changelog/add-cornerstone-to-site-health
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Critical CSS: Flag a site-health issue if critical CSS is not fresh after cornerstone pages changed.
diff --git a/projects/plugins/boost/changelog/fix-boost-cache-bypass-patterns b/projects/plugins/boost/changelog/fix-boost-cache-bypass-patterns
new file mode 100644
index 0000000000000..a7371df8724df
--- /dev/null
+++ b/projects/plugins/boost/changelog/fix-boost-cache-bypass-patterns
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Page Cache: Fixed bypass patterns getting applied to the whole URL instead of the start.
diff --git a/projects/plugins/boost/changelog/fix-image-cdn-double-encoding b/projects/plugins/boost/changelog/fix-image-cdn-double-encoding
new file mode 100644
index 0000000000000..da2382199f128
--- /dev/null
+++ b/projects/plugins/boost/changelog/fix-image-cdn-double-encoding
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Image CDN: Ensure that double encoding doesn't happen.
diff --git a/projects/plugins/boost/changelog/fix-woocommerce-shipping-concat-js-conflict b/projects/plugins/boost/changelog/fix-woocommerce-shipping-concat-js-conflict
new file mode 100644
index 0000000000000..0dc8fa2292958
--- /dev/null
+++ b/projects/plugins/boost/changelog/fix-woocommerce-shipping-concat-js-conflict
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Concatenate JS: Improve compatibility with WooCommerce shipping.
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/prerelease b/projects/plugins/boost/changelog/prerelease
similarity index 100%
rename from projects/plugins/automattic-for-agencies-client/changelog/prerelease
rename to projects/plugins/boost/changelog/prerelease
diff --git a/projects/plugins/social/changelog/renovate-lock-file-maintenance b/projects/plugins/boost/changelog/renovate-lock-file-maintenance
similarity index 100%
rename from projects/plugins/social/changelog/renovate-lock-file-maintenance
rename to projects/plugins/boost/changelog/renovate-lock-file-maintenance
diff --git a/projects/plugins/boost/changelog/update-boost-minify-css-library b/projects/plugins/boost/changelog/update-boost-minify-css-library
new file mode 100644
index 0000000000000..0ebb483a0aa90
--- /dev/null
+++ b/projects/plugins/boost/changelog/update-boost-minify-css-library
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Concatenate CSS: Fixed cases where minification might cause a file to load slower.
diff --git a/projects/plugins/boost/compatibility/js-concatenate.php b/projects/plugins/boost/compatibility/js-concatenate.php
index 3b1d2855b3268..b4aca14772b45 100644
--- a/projects/plugins/boost/compatibility/js-concatenate.php
+++ b/projects/plugins/boost/compatibility/js-concatenate.php
@@ -10,6 +10,8 @@ function maybe_do_not_concat( $do_concat, $handle ) {
// Plugin: `event-tickets`
'tribe-tickets-block',
'tribe-tickets-provider',
+ // Plugin: `woocommerce-shipping`
+ 'woocommerce-shipping-checkout-address-validation',
);
if ( in_array( $handle, $excluded_handles, true ) ) {
diff --git a/projects/plugins/boost/composer.json b/projects/plugins/boost/composer.json
index 6e61bc7dac944..ec30d7a91d786 100644
--- a/projects/plugins/boost/composer.json
+++ b/projects/plugins/boost/composer.json
@@ -30,8 +30,7 @@
"automattic/jetpack-status": "@dev",
"automattic/jetpack-sync": "@dev",
"automattic/jetpack-wp-js-data-sync": "@dev",
- "matthiasmullie/minify": "^1.3",
- "tubalmartin/cssmin": "^4.1"
+ "matthiasmullie/minify": "^1.3"
},
"require-dev": {
"automattic/jetpack-changelogger": "@dev",
diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock
index 0f419db440f0b..927aaeae52c9f 100644
--- a/projects/plugins/boost/composer.lock
+++ b/projects/plugins/boost/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "b52098ae2e5a4e594034ec41fb2636e6",
+ "content-hash": "0ad50993accd8a26f9fd344099d8a588",
"packages": [
{
"name": "automattic/jetpack-a8c-mc-stats",
@@ -1876,7 +1876,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "ece2cb5be16c8bc399fb6681a61ffa42b42e3cf5"
+ "reference": "9f24b0cb0912e1e3f235e946b9f397ffd9e36ccf"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -1909,7 +1909,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "4.2.x-dev"
+ "dev-trunk": "4.3.x-dev"
},
"dependencies": {
"test-only": [
@@ -2142,78 +2142,21 @@
"source": "https://github.com/matthiasmullie/path-converter/tree/1.1.3"
},
"time": "2019-02-05T23:41:09+00:00"
- },
- {
- "name": "tubalmartin/cssmin",
- "version": "v4.1.1",
- "source": {
- "type": "git",
- "url": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port.git",
- "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/tubalmartin/YUI-CSS-compressor-PHP-port/zipball/3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
- "reference": "3cbf557f4079d83a06f9c3ff9b957c022d7805cf",
- "shasum": ""
- },
- "require": {
- "ext-pcre": "*",
- "php": ">=5.3.2"
- },
- "require-dev": {
- "cogpowered/finediff": "0.3.*",
- "phpunit/phpunit": "4.8.*"
- },
- "bin": [
- "cssmin"
- ],
- "type": "library",
- "autoload": {
- "psr-4": {
- "tubalmartin\\CssMin\\": "src"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Túbal Martín",
- "homepage": "http://tubalmartin.me/"
- }
- ],
- "description": "A PHP port of the YUI CSS compressor",
- "homepage": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port",
- "keywords": [
- "compress",
- "compressor",
- "css",
- "cssmin",
- "minify",
- "yui"
- ],
- "support": {
- "issues": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port/issues",
- "source": "https://github.com/tubalmartin/YUI-CSS-compressor-PHP-port"
- },
- "time": "2018-01-15T15:26:51+00:00"
}
],
"packages-dev": [
{
"name": "antecedent/patchwork",
- "version": "2.2.0",
+ "version": "2.2.1",
"source": {
"type": "git",
"url": "https://github.com/antecedent/patchwork.git",
- "reference": "b07d4fb37c3c723c8755122160c089e077d5de65"
+ "reference": "1bf183a3e1bd094f231a2128b9ecc5363c269245"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/antecedent/patchwork/zipball/b07d4fb37c3c723c8755122160c089e077d5de65",
- "reference": "b07d4fb37c3c723c8755122160c089e077d5de65",
+ "url": "https://api.github.com/repos/antecedent/patchwork/zipball/1bf183a3e1bd094f231a2128b9ecc5363c269245",
+ "reference": "1bf183a3e1bd094f231a2128b9ecc5363c269245",
"shasum": ""
},
"require": {
@@ -2246,9 +2189,9 @@
],
"support": {
"issues": "https://github.com/antecedent/patchwork/issues",
- "source": "https://github.com/antecedent/patchwork/tree/2.2.0"
+ "source": "https://github.com/antecedent/patchwork/tree/2.2.1"
},
- "time": "2024-09-27T16:59:55+00:00"
+ "time": "2024-12-11T10:19:54+00:00"
},
{
"name": "automattic/jetpack-changelogger",
@@ -2708,16 +2651,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.1",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
"shasum": ""
},
"require": {
@@ -2760,9 +2703,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
},
- "time": "2024-10-08T18:51:32+00:00"
+ "time": "2024-12-30T11:07:19+00:00"
},
{
"name": "phar-io/manifest",
@@ -4506,16 +4449,16 @@
},
{
"name": "symfony/console",
- "version": "v7.2.0",
+ "version": "v7.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf"
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
+ "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
"shasum": ""
},
"require": {
@@ -4579,7 +4522,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.2.0"
+ "source": "https://github.com/symfony/console/tree/v7.2.1"
},
"funding": [
{
@@ -4595,7 +4538,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-06T14:24:19+00:00"
+ "time": "2024-12-11T03:49:26+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -4616,12 +4559,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4928,8 +4871,8 @@
"type": "library",
"extra": {
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -5067,12 +5010,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -5265,16 +5208,16 @@
},
{
"name": "yoast/phpunit-polyfills",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be"
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
+ "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
"shasum": ""
},
"require": {
@@ -5324,7 +5267,7 @@
"security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
"source": "https://github.com/Yoast/PHPUnit-Polyfills"
},
- "time": "2024-09-06T22:03:10+00:00"
+ "time": "2025-01-08T16:58:34+00:00"
}
],
"aliases": [],
diff --git a/projects/plugins/boost/serve-minified-content.php b/projects/plugins/boost/serve-minified-content.php
index 59271179ad317..0fd83f7a655a9 100644
--- a/projects/plugins/boost/serve-minified-content.php
+++ b/projects/plugins/boost/serve-minified-content.php
@@ -3,10 +3,14 @@
if ( ! defined( 'JETPACK_BOOST_CONCAT_USE_WP' ) ) {
define( 'JETPACK_BOOST_CONCAT_USE_WP', false );
- // Load CSSmin.
- require_once __DIR__ . '/vendor/tubalmartin/cssmin/src/Colors.php';
- require_once __DIR__ . '/vendor/tubalmartin/cssmin/src/Utils.php';
- require_once __DIR__ . '/vendor/tubalmartin/cssmin/src/Minifier.php';
+ // Load minification library.
+ require_once __DIR__ . '/vendor/matthiasmullie/minify/src/Exception.php';
+ require_once __DIR__ . '/vendor/matthiasmullie/minify/src/Minify.php';
+ require_once __DIR__ . '/vendor/matthiasmullie/minify/src/CSS.php';
+ require_once __DIR__ . '/vendor/matthiasmullie/minify/src/JS.php';
+ require_once __DIR__ . '/vendor/matthiasmullie/minify/src/Exceptions/BasicException.php';
+ require_once __DIR__ . '/vendor/matthiasmullie/minify/src/Exceptions/FileImportException.php';
+ require_once __DIR__ . '/vendor/matthiasmullie/minify/src/Exceptions/IOException.php';
}
// Load minify library code.
diff --git a/projects/plugins/classic-theme-helper-plugin/changelog/fix-testimonials-module-by-zero-error b/projects/plugins/classic-theme-helper-plugin/changelog/fix-testimonials-module-by-zero-error
new file mode 100644
index 0000000000000..cfcf858702e8b
--- /dev/null
+++ b/projects/plugins/classic-theme-helper-plugin/changelog/fix-testimonials-module-by-zero-error
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Testimonials: fix a shortcode related bug which ccurs if the column attribute is added and set to 0
diff --git a/projects/plugins/search/changelog/prerelease#14 b/projects/plugins/classic-theme-helper-plugin/changelog/prerelease#14
similarity index 100%
rename from projects/plugins/search/changelog/prerelease#14
rename to projects/plugins/classic-theme-helper-plugin/changelog/prerelease#14
diff --git a/projects/github-actions/required-review/changelog/renovate-picomatch-4.x b/projects/plugins/classic-theme-helper-plugin/changelog/renovate-lock-file-maintenance#11
similarity index 100%
rename from projects/github-actions/required-review/changelog/renovate-picomatch-4.x
rename to projects/plugins/classic-theme-helper-plugin/changelog/renovate-lock-file-maintenance#11
diff --git a/projects/plugins/classic-theme-helper-plugin/composer.lock b/projects/plugins/classic-theme-helper-plugin/composer.lock
index 72ba0b820a3c3..28fa01c5376aa 100644
--- a/projects/plugins/classic-theme-helper-plugin/composer.lock
+++ b/projects/plugins/classic-theme-helper-plugin/composer.lock
@@ -202,7 +202,7 @@
"dist": {
"type": "path",
"url": "../../packages/classic-theme-helper",
- "reference": "198fd841c5341850e247c46168d77b1bc6a13a34"
+ "reference": "97a68997e5f3dc805df942c53586bab3f2137427"
},
"require": {
"automattic/jetpack-assets": "@dev",
@@ -220,7 +220,7 @@
"extra": {
"autotagger": true,
"branch-alias": {
- "dev-trunk": "0.8.x-dev"
+ "dev-trunk": "0.9.x-dev"
},
"changelogger": {
"link-template": "https://github.com/Automattic/jetpack-classic-theme-helper/compare/v${old}...v${new}"
@@ -577,16 +577,16 @@
"packages-dev": [
{
"name": "antecedent/patchwork",
- "version": "2.2.0",
+ "version": "2.2.1",
"source": {
"type": "git",
"url": "https://github.com/antecedent/patchwork.git",
- "reference": "b07d4fb37c3c723c8755122160c089e077d5de65"
+ "reference": "1bf183a3e1bd094f231a2128b9ecc5363c269245"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/antecedent/patchwork/zipball/b07d4fb37c3c723c8755122160c089e077d5de65",
- "reference": "b07d4fb37c3c723c8755122160c089e077d5de65",
+ "url": "https://api.github.com/repos/antecedent/patchwork/zipball/1bf183a3e1bd094f231a2128b9ecc5363c269245",
+ "reference": "1bf183a3e1bd094f231a2128b9ecc5363c269245",
"shasum": ""
},
"require": {
@@ -619,9 +619,9 @@
],
"support": {
"issues": "https://github.com/antecedent/patchwork/issues",
- "source": "https://github.com/antecedent/patchwork/tree/2.2.0"
+ "source": "https://github.com/antecedent/patchwork/tree/2.2.1"
},
- "time": "2024-09-27T16:59:55+00:00"
+ "time": "2024-12-11T10:19:54+00:00"
},
{
"name": "automattic/jetpack-changelogger",
@@ -1081,16 +1081,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.1",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
"shasum": ""
},
"require": {
@@ -1133,9 +1133,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
},
- "time": "2024-10-08T18:51:32+00:00"
+ "time": "2024-12-30T11:07:19+00:00"
},
{
"name": "phar-io/manifest",
@@ -2879,16 +2879,16 @@
},
{
"name": "symfony/console",
- "version": "v7.2.0",
+ "version": "v7.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf"
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
+ "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
"shasum": ""
},
"require": {
@@ -2952,7 +2952,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.2.0"
+ "source": "https://github.com/symfony/console/tree/v7.2.1"
},
"funding": [
{
@@ -2968,7 +2968,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-06T14:24:19+00:00"
+ "time": "2024-12-11T03:49:26+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -2989,12 +2989,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -3301,8 +3301,8 @@
"type": "library",
"extra": {
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -3440,12 +3440,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -3638,16 +3638,16 @@
},
{
"name": "yoast/phpunit-polyfills",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be"
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
+ "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
"shasum": ""
},
"require": {
@@ -3697,7 +3697,7 @@
"security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
"source": "https://github.com/Yoast/PHPUnit-Polyfills"
},
- "time": "2024-09-06T22:03:10+00:00"
+ "time": "2025-01-08T16:58:34+00:00"
}
],
"aliases": [],
diff --git a/projects/plugins/crm/CHANGELOG.md b/projects/plugins/crm/CHANGELOG.md
index 1b54edb90f045..ab454bb1027c1 100644
--- a/projects/plugins/crm/CHANGELOG.md
+++ b/projects/plugins/crm/CHANGELOG.md
@@ -5,8 +5,25 @@
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).
-## [6.4.4] - 2024-08-07
+## [6.5.0] - 2025-01-10
+
+### Removed
+- General: Remove unused legacy code. [#40267]
+
+### Changed
+- General: Update minimum WordPress version to 6.6. [#40146]
+- API: Allow sort order in endpoints. [#38838]
+### Fixed
+- CRM: Fix bug which caused duplicated queries to run. [#40711]
+- CRM: Fix a fatal error that occurred when exporting contacts with a custom field that had the same name as a linked field (e.g., 'company'). [#38851]
+- Dashboard: Fix an issue where the CRM contacts graph displayed incorrect values in some instances. [#38316]
+- Dashboard: Show correct avatar for recent activity. [#40280]
+- Invoices: Fix bugs in the default PDF template and other fixes. Created a new template to maintain backwards compatibility. [#40514]
+- Code: Ensure we use Jetpack Autoloader throughout the codebase. [#40061]
+- Migrations: Improve WP Playground compatibility. [#39956]
+
+## [6.4.4] - 2024-08-07
### Removed
- MailPoet: Remove unused MailPoet use statements. [#38453]
@@ -3600,7 +3617,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Tested across 4 common web hosts
- Tested with extensions: WooCommerce CRM Sync, PayPal CRM Sync, CSV Importer, ZBS CRM Mail Campaigns, and CRM Sales Dashboard
-[5.5.4-a.1]: https://github.com/Automattic/jetpack-crm/compare/v5.5.3...v5.5.4-a.1
+[6.5.0]: https://github.com/Automattic/jetpack-crm/compare/6.4.4...6.5.0
[6.4.4]: https://github.com/Automattic/jetpack-crm/compare/6.4.3...6.4.4
[6.4.3]: https://github.com/Automattic/jetpack-crm/compare/6.4.2...6.4.3
[6.4.2]: https://github.com/Automattic/jetpack-crm/compare/6.4.1...6.4.2
@@ -3615,3 +3632,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[5.8.0]: https://github.com/Automattic/jetpack-crm/compare/5.7.0...5.8.0
[5.7.0]: https://github.com/Automattic/jetpack-crm/compare/v5.6.0...v5.7.0
[5.6.0]: https://github.com/Automattic/jetpack-crm/compare/v5.5.4-a.1...v5.6.0
+[5.5.4-a.1]: https://github.com/Automattic/jetpack-crm/compare/v5.5.3...v5.5.4-a.1
diff --git a/projects/plugins/crm/ZeroBSCRM.php b/projects/plugins/crm/ZeroBSCRM.php
index 510e48fecc161..7c8dcbe70a5c0 100644
--- a/projects/plugins/crm/ZeroBSCRM.php
+++ b/projects/plugins/crm/ZeroBSCRM.php
@@ -3,7 +3,7 @@
* Plugin Name: Jetpack CRM
* Plugin URI: https://jetpackcrm.com
* Description: Jetpack CRM is the simplest CRM for WordPress. Self host your own Customer Relationship Manager using WP.
- * Version: 6.4.4
+ * Version: 6.5.0
* Author: Automattic - Jetpack CRM team
* Author URI: https://jetpackcrm.com
* Text Domain: zero-bs-crm
diff --git a/projects/plugins/crm/admin/settings/general.page.php b/projects/plugins/crm/admin/settings/general.page.php
index 9b6c9d96797d8..01d81fd5c1a01 100644
--- a/projects/plugins/crm/admin/settings/general.page.php
+++ b/projects/plugins/crm/admin/settings/general.page.php
@@ -601,9 +601,7 @@
-
-
|
$search_phrase,
- 'perPage' => $per_page,
- 'page' => $page,
+ 'page' => $pagination['page'],
+ 'perPage' => $pagination['per_page'],
+ 'sortOrder' => $pagination['order'],
);
global $zbs;
diff --git a/projects/plugins/crm/api/events.php b/projects/plugins/crm/api/events.php
index 0bc7ae28bc1f6..99392f9b08dcc 100644
--- a/projects/plugins/crm/api/events.php
+++ b/projects/plugins/crm/api/events.php
@@ -26,7 +26,7 @@
jpcrm_api_check_http_method( array( 'GET' ) );
// Process the pagination parameters from the query
-list( $page, $per_page ) = jpcrm_api_process_pagination();
+$pagination = jpcrm_api_process_pagination();
/**
* Allow events to be filtered by owner. Docs are ambiguous about
@@ -44,8 +44,9 @@
$args = array(
'withAssigned' => true,
- 'page' => $page,
- 'perPage' => $per_page,
+ 'page' => $pagination['page'],
+ 'perPage' => $pagination['per_page'],
+ 'sortOrder' => $pagination['order'],
'ownedBy' => $owner,
'ignoreowner' => zeroBSCRM_DAL2_ignoreOwnership( ZBS_TYPE_TASK ),
);
diff --git a/projects/plugins/crm/api/invoices.php b/projects/plugins/crm/api/invoices.php
index c346a66839e53..528120c906024 100644
--- a/projects/plugins/crm/api/invoices.php
+++ b/projects/plugins/crm/api/invoices.php
@@ -26,10 +26,16 @@
jpcrm_api_check_http_method( array( 'GET' ) );
// Process the pagination parameters from the query
-list( $page, $per_page ) = jpcrm_api_process_pagination();
+$pagination = jpcrm_api_process_pagination();
+$args = array(
+ 'withAssigned' => false,
+ 'page' => $pagination['page'],
+ 'perPage' => $pagination['per_page'],
+ 'sortOrder' => $pagination['order'],
+);
+
+global $zbs;
+$invoices = $zbs->DAL->invoices->getInvoices( $args ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-// needs moving to the $args version
-// v3.0 needs these objects refined, including textify for html
-$invoices = zeroBS_getInvoices( true, $per_page, $page );
wp_send_json( $invoices );
diff --git a/projects/plugins/crm/api/quotes.php b/projects/plugins/crm/api/quotes.php
index 9550e99e4db9a..f47d508d319c4 100644
--- a/projects/plugins/crm/api/quotes.php
+++ b/projects/plugins/crm/api/quotes.php
@@ -26,7 +26,7 @@
jpcrm_api_check_http_method( array( 'GET' ) );
// Process the pagination parameters from the query
-list( $page, $per_page ) = jpcrm_api_process_pagination();
+$pagination = jpcrm_api_process_pagination();
global $zbs;
@@ -39,9 +39,9 @@
// 'withAssigned' => $withCustomerDeets,
'suppressContent' => true, // NO HTML!
'sortByField' => 'ID',
- 'sortOrder' => 'DESC',
- 'page' => $page,
- 'perPage' => $per_page,
+ 'page' => $pagination['page'],
+ 'perPage' => $pagination['per_page'],
+ 'sortOrder' => $pagination['order'],
'ignoreowner' => zeroBSCRM_DAL2_ignoreOwnership( ZBS_TYPE_QUOTE ),
);
diff --git a/projects/plugins/crm/api/transactions.php b/projects/plugins/crm/api/transactions.php
index 729693f47c979..79cb81c3d9e8b 100644
--- a/projects/plugins/crm/api/transactions.php
+++ b/projects/plugins/crm/api/transactions.php
@@ -26,10 +26,16 @@
jpcrm_api_check_http_method( array( 'GET' ) );
// Process the pagination parameters from the query
-list( $page, $per_page ) = jpcrm_api_process_pagination();
+$pagination = jpcrm_api_process_pagination();
+$args = array(
+ 'withAssigned' => false,
+ 'withTags' => false,
+ 'page' => $pagination['page'],
+ 'perPage' => $pagination['per_page'],
+ 'sortOrder' => $pagination['order'],
+);
-// needs moving to the $args version
-// v3.0 needs these objects refined, including textify for html
-$transactions = zeroBS_getTransactions( true, $per_page, $page );
+global $zbs;
+$transactions = $zbs->DAL->transactions->getTransactions( $args ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
wp_send_json( $transactions );
diff --git a/projects/plugins/crm/changelog/add-ci-always-process-coverage b/projects/plugins/crm/changelog/add-ci-always-process-coverage
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/crm/changelog/add-ci-always-process-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/crm/changelog/add-consolidate-initial-state b/projects/plugins/crm/changelog/add-consolidate-initial-state
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/crm/changelog/add-consolidate-initial-state
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/crm/changelog/add-dependency-extraction-auto-polyfill b/projects/plugins/crm/changelog/add-dependency-extraction-auto-polyfill
deleted file mode 100644
index f4cd286e166af..0000000000000
--- a/projects/plugins/crm/changelog/add-dependency-extraction-auto-polyfill
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Only include `wp-polyfill` as a script dependency when needed.
diff --git a/projects/plugins/crm/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return b/projects/plugins/crm/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return
deleted file mode 100644
index 7f30b15d5fb4c..0000000000000
--- a/projects/plugins/crm/changelog/add-enable-eslint-wordpress-no-unused-vars-before-return
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Rearranged some variable assignments for new eslint `@wordpress/no-unused-vars-before-return` rule. Should be no changes to functionality.
-
-
diff --git a/projects/plugins/crm/changelog/add-phpunit-coverage-configs b/projects/plugins/crm/changelog/add-phpunit-coverage-configs
deleted file mode 100644
index 714f2593c8f4b..0000000000000
--- a/projects/plugins/crm/changelog/add-phpunit-coverage-configs
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Add missing files/dirs to phpunit coverage config.
-
-
diff --git a/projects/plugins/crm/changelog/add-structure-lint-eslint-react b/projects/plugins/crm/changelog/add-structure-lint-eslint-react
deleted file mode 100644
index deab1a20d649c..0000000000000
--- a/projects/plugins/crm/changelog/add-structure-lint-eslint-react
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: added
-Comment: Add `@todo` comment about enabling jetpack-js-tools/eslintrc/react.
-
-
diff --git a/projects/plugins/crm/changelog/fix-bump_composer_versions b/projects/plugins/crm/changelog/fix-bump_composer_versions
deleted file mode 100644
index 13cbf3392f78d..0000000000000
--- a/projects/plugins/crm/changelog/fix-bump_composer_versions
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated dependencies.
diff --git a/projects/plugins/crm/changelog/fix-bump_composer_versions_round2#2 b/projects/plugins/crm/changelog/fix-bump_composer_versions_round2#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/crm/changelog/fix-bump_composer_versions_round2#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/crm/changelog/fix-crm-3468-dashboard-contact-graph-fix b/projects/plugins/crm/changelog/fix-crm-3468-dashboard-contact-graph-fix
deleted file mode 100644
index 99116cdb2a395..0000000000000
--- a/projects/plugins/crm/changelog/fix-crm-3468-dashboard-contact-graph-fix
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Dashboard: Fixed an issue where the CRM contacts graph displayed incorrect values in some instances
diff --git a/projects/plugins/crm/changelog/fix-crm-3477-fix-export-crash-when-company-custom-field b/projects/plugins/crm/changelog/fix-crm-3477-fix-export-crash-when-company-custom-field
deleted file mode 100644
index 9a81dde96f524..0000000000000
--- a/projects/plugins/crm/changelog/fix-crm-3477-fix-export-crash-when-company-custom-field
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Fixed a fatal error that occurred when exporting contacts with a custom field that had the same name as a linked field (e.g., 'company').
\ No newline at end of file
diff --git a/projects/plugins/crm/changelog/fix-crm-3504-hundreds-of-unnedded-db-queries-fix b/projects/plugins/crm/changelog/fix-crm-3504-hundreds-of-unnedded-db-queries-fix
deleted file mode 100644
index 83a1f7de5368e..0000000000000
--- a/projects/plugins/crm/changelog/fix-crm-3504-hundreds-of-unnedded-db-queries-fix
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-CRM: Fix bug which caused duplicated queries to run.
diff --git a/projects/plugins/crm/changelog/fix-crm-linting b/projects/plugins/crm/changelog/fix-crm-linting
deleted file mode 100644
index 9e62896e5faa0..0000000000000
--- a/projects/plugins/crm/changelog/fix-crm-linting
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-General: Enable JavaScript linting.
diff --git a/projects/plugins/crm/changelog/fix-crm-linting2 b/projects/plugins/crm/changelog/fix-crm-linting2
deleted file mode 100644
index e221da8a25ff0..0000000000000
--- a/projects/plugins/crm/changelog/fix-crm-linting2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: removed
-
-Removed legacy beta feedback code.
diff --git a/projects/plugins/crm/changelog/fix-crm-linting3 b/projects/plugins/crm/changelog/fix-crm-linting3
deleted file mode 100644
index 71e036226da1e..0000000000000
--- a/projects/plugins/crm/changelog/fix-crm-linting3
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: removed
-
-Removed old build file.
diff --git a/projects/plugins/crm/changelog/fix-crm-migration_error_on_sqlite b/projects/plugins/crm/changelog/fix-crm-migration_error_on_sqlite
deleted file mode 100644
index 29767e3f5c183..0000000000000
--- a/projects/plugins/crm/changelog/fix-crm-migration_error_on_sqlite
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Migrations: Improve WP Playground compatibility.
diff --git a/projects/plugins/crm/changelog/fix-crm-php_error_on_dash b/projects/plugins/crm/changelog/fix-crm-php_error_on_dash
deleted file mode 100644
index 25d1f6ffc89d3..0000000000000
--- a/projects/plugins/crm/changelog/fix-crm-php_error_on_dash
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Dashboard: Show correct avatar for recent activity.
diff --git a/projects/plugins/crm/changelog/fix-crm-remove_legacy_code b/projects/plugins/crm/changelog/fix-crm-remove_legacy_code
deleted file mode 100644
index b72565da98fe1..0000000000000
--- a/projects/plugins/crm/changelog/fix-crm-remove_legacy_code
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: removed
-
-General: Remove unused legacy code.
diff --git a/projects/plugins/crm/changelog/fix-crm-update-version-to-644-in-ZeroBSCRMCore b/projects/plugins/crm/changelog/fix-crm-update-version-to-644-in-ZeroBSCRMCore
deleted file mode 100644
index 8e05271dbbb32..0000000000000
--- a/projects/plugins/crm/changelog/fix-crm-update-version-to-644-in-ZeroBSCRMCore
+++ /dev/null
@@ -1,3 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Fixed the version (to 6.4.4) in includes/ZeroBSCRM.Core.php
\ No newline at end of file
diff --git a/projects/plugins/crm/changelog/fix-crm-use_jetpack_autoloader b/projects/plugins/crm/changelog/fix-crm-use_jetpack_autoloader
deleted file mode 100644
index 365e1c02a52ad..0000000000000
--- a/projects/plugins/crm/changelog/fix-crm-use_jetpack_autoloader
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Code: Ensure we use Jetpack Autoloader throughout the codebase.
diff --git a/projects/plugins/crm/changelog/fix-deprecated-react-test-renderer-usage b/projects/plugins/crm/changelog/fix-deprecated-react-test-renderer-usage
deleted file mode 100644
index c72b599f7c01e..0000000000000
--- a/projects/plugins/crm/changelog/fix-deprecated-react-test-renderer-usage
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: removed
-
-Tests: Removed react-test-renderer.
diff --git a/projects/plugins/crm/changelog/fix-phpcompatibility-new-dev-sniff b/projects/plugins/crm/changelog/fix-phpcompatibility-new-dev-sniff
deleted file mode 100644
index 4c112ce236ea6..0000000000000
--- a/projects/plugins/crm/changelog/fix-phpcompatibility-new-dev-sniff
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Improve spec compliance of CSV output: `\"` sequences will now be correctly escaped by doubling the `"`.
diff --git a/projects/plugins/crm/changelog/prerelease b/projects/plugins/crm/changelog/prerelease
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/crm/changelog/prerelease
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/crm/changelog/prerelease#2 b/projects/plugins/crm/changelog/prerelease#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/crm/changelog/prerelease#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/crm/changelog/prerelease#3 b/projects/plugins/crm/changelog/prerelease#3
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/crm/changelog/prerelease#3
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/crm/changelog/prerelease#4 b/projects/plugins/crm/changelog/prerelease#4
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/crm/changelog/prerelease#4
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/crm/changelog/prerelease#5 b/projects/plugins/crm/changelog/prerelease#5
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/crm/changelog/prerelease#5
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/crm/changelog/prerelease#6 b/projects/plugins/crm/changelog/prerelease#6
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/crm/changelog/prerelease#6
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/crm/changelog/remove-pre_wp6.6_and_php7.2_code b/projects/plugins/crm/changelog/remove-pre_wp6.6_and_php7.2_code
deleted file mode 100644
index 8bc7df4543fb6..0000000000000
--- a/projects/plugins/crm/changelog/remove-pre_wp6.6_and_php7.2_code
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Additional cleanup of old PHP + WP version support.
-
-
diff --git a/projects/plugins/crm/changelog/renovate-babel-monorepo b/projects/plugins/crm/changelog/renovate-babel-monorepo
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-babel-monorepo
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-brain-monkey-2.x b/projects/plugins/crm/changelog/renovate-brain-monkey-2.x
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/crm/changelog/renovate-brain-monkey-2.x
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/crm/changelog/renovate-definitelytyped b/projects/plugins/crm/changelog/renovate-definitelytyped
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-definitelytyped
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-definitelytyped#2 b/projects/plugins/crm/changelog/renovate-definitelytyped#2
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-definitelytyped#2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-definitelytyped#3 b/projects/plugins/crm/changelog/renovate-definitelytyped#3
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-definitelytyped#3
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-glob-11.x b/projects/plugins/crm/changelog/renovate-glob-11.x
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-glob-11.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-js-unit-testing-packages b/projects/plugins/crm/changelog/renovate-js-unit-testing-packages
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-js-unit-testing-packages
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-lock-file-maintenance#3 b/projects/plugins/crm/changelog/renovate-lock-file-maintenance#3
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-lock-file-maintenance#3
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-lock-file-maintenance#4 b/projects/plugins/crm/changelog/renovate-lock-file-maintenance#4
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/crm/changelog/renovate-lock-file-maintenance#4
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/crm/changelog/renovate-lock-file-maintenance#5 b/projects/plugins/crm/changelog/renovate-lock-file-maintenance#5
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-lock-file-maintenance#5
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-lock-file-maintenance#6 b/projects/plugins/crm/changelog/renovate-lock-file-maintenance#6
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/crm/changelog/renovate-lock-file-maintenance#6
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/crm/changelog/renovate-lock-file-maintenance#7 b/projects/plugins/crm/changelog/renovate-lock-file-maintenance#7
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-lock-file-maintenance#7
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-major-js-unit-testing-packages b/projects/plugins/crm/changelog/renovate-major-js-unit-testing-packages
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-major-js-unit-testing-packages
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-mediawiki-mediawiki-codesniffer-44.x b/projects/plugins/crm/changelog/renovate-mediawiki-mediawiki-codesniffer-44.x
deleted file mode 100644
index 5ab42f8a0abd8..0000000000000
--- a/projects/plugins/crm/changelog/renovate-mediawiki-mediawiki-codesniffer-44.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Fix missing types in phpdoc comments.
-
diff --git a/projects/plugins/crm/changelog/renovate-npm-webpack-vulnerability b/projects/plugins/crm/changelog/renovate-npm-webpack-vulnerability
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-npm-webpack-vulnerability
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-react-router-monorepo b/projects/plugins/crm/changelog/renovate-react-router-monorepo
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-react-router-monorepo
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-wordpress-monorepo b/projects/plugins/crm/changelog/renovate-wordpress-monorepo
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-wordpress-monorepo
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-wordpress-monorepo#2 b/projects/plugins/crm/changelog/renovate-wordpress-monorepo#2
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-wordpress-monorepo#2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-wordpress-monorepo#3 b/projects/plugins/crm/changelog/renovate-wordpress-monorepo#3
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-wordpress-monorepo#3
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-wordpress-monorepo#4 b/projects/plugins/crm/changelog/renovate-wordpress-monorepo#4
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-wordpress-monorepo#4
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-wordpress-monorepo#5 b/projects/plugins/crm/changelog/renovate-wordpress-monorepo#5
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-wordpress-monorepo#5
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-wordpress-monorepo#6 b/projects/plugins/crm/changelog/renovate-wordpress-monorepo#6
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-wordpress-monorepo#6
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-wordpress-monorepo#7 b/projects/plugins/crm/changelog/renovate-wordpress-monorepo#7
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-wordpress-monorepo#7
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-wordpress-monorepo#8 b/projects/plugins/crm/changelog/renovate-wordpress-monorepo#8
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-wordpress-monorepo#8
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-wordpress-monorepo#9 b/projects/plugins/crm/changelog/renovate-wordpress-monorepo#9
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-wordpress-monorepo#9
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/renovate-yoast-phpunit-polyfills-1.x b/projects/plugins/crm/changelog/renovate-yoast-phpunit-polyfills-1.x
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/crm/changelog/renovate-yoast-phpunit-polyfills-1.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/crm/changelog/restore-jp_test_coverage b/projects/plugins/crm/changelog/restore-jp_test_coverage
deleted file mode 100644
index 7bb19dc79dd19..0000000000000
--- a/projects/plugins/crm/changelog/restore-jp_test_coverage
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Enable test coverage.
diff --git a/projects/plugins/crm/changelog/restore-jp_test_coverage#2 b/projects/plugins/crm/changelog/restore-jp_test_coverage#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/crm/changelog/restore-jp_test_coverage#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/crm/changelog/revert-svg-image-optimizations b/projects/plugins/crm/changelog/revert-svg-image-optimizations
deleted file mode 100644
index 356496f8a1f8f..0000000000000
--- a/projects/plugins/crm/changelog/revert-svg-image-optimizations
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Revert recent SVG image optimizations.
diff --git a/projects/plugins/crm/changelog/try-lossless-image-optmization-part-3 b/projects/plugins/crm/changelog/try-lossless-image-optmization-part-3
deleted file mode 100644
index cf77a8b55bb43..0000000000000
--- a/projects/plugins/crm/changelog/try-lossless-image-optmization-part-3
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Lossless image optimization for images (should improve performance with no visible changes).
diff --git a/projects/plugins/crm/changelog/try-no-version-bumps-in-trunk b/projects/plugins/crm/changelog/try-no-version-bumps-in-trunk
deleted file mode 100644
index 91efe85c55e06..0000000000000
--- a/projects/plugins/crm/changelog/try-no-version-bumps-in-trunk
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Un-bump version numbers in trunk. The build will now update the version numbers as needed for mirrors.
-
-
diff --git a/projects/plugins/crm/changelog/update-bump_min_php_to_7.2 b/projects/plugins/crm/changelog/update-bump_min_php_to_7.2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/crm/changelog/update-bump_min_php_to_7.2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/crm/changelog/update-bump_min_wp_to_6.6 b/projects/plugins/crm/changelog/update-bump_min_wp_to_6.6
deleted file mode 100644
index b5daa14e55bc4..0000000000000
--- a/projects/plugins/crm/changelog/update-bump_min_wp_to_6.6
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: major
-Type: removed
-
-General: Update minimum WordPress version to 6.6.
diff --git a/projects/plugins/crm/changelog/update-ci-tests-in-parallel b/projects/plugins/crm/changelog/update-ci-tests-in-parallel
deleted file mode 100644
index 5dbb1d9f0de65..0000000000000
--- a/projects/plugins/crm/changelog/update-ci-tests-in-parallel
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Use WP_TESTS_CONFIG_FILE_PATH env var in tests.
-
-
diff --git a/projects/plugins/crm/changelog/update-composer b/projects/plugins/crm/changelog/update-composer
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/crm/changelog/update-composer
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/crm/changelog/update-eslint-9 b/projects/plugins/crm/changelog/update-eslint-9
deleted file mode 100644
index 1cb10572ab69e..0000000000000
--- a/projects/plugins/crm/changelog/update-eslint-9
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Update eslint config for eslint 9.
-
-
diff --git a/projects/plugins/crm/changelog/update-eslint-config-for-ts-files b/projects/plugins/crm/changelog/update-eslint-config-for-ts-files
deleted file mode 100644
index fefec667583fd..0000000000000
--- a/projects/plugins/crm/changelog/update-eslint-config-for-ts-files
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Fixed lints following ESLint rule changes for TS
diff --git a/projects/plugins/crm/changelog/update-jsdoc-comments-for-wp-coding-standards b/projects/plugins/crm/changelog/update-jsdoc-comments-for-wp-coding-standards
deleted file mode 100644
index 0e655b2b8b7a3..0000000000000
--- a/projects/plugins/crm/changelog/update-jsdoc-comments-for-wp-coding-standards
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Reformat jsdoc comments. No change to meaning or functionality.
-
-
diff --git a/projects/plugins/crm/changelog/update-plugins-fix-eslint-9-lints b/projects/plugins/crm/changelog/update-plugins-fix-eslint-9-lints
deleted file mode 100644
index b3176fbef2f88..0000000000000
--- a/projects/plugins/crm/changelog/update-plugins-fix-eslint-9-lints
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Fix some JS lints ahead of eslint 9 upgrade.
-
-
diff --git a/projects/plugins/crm/changelog/update-replace-abandoned-eslint-import-resolver-exports b/projects/plugins/crm/changelog/update-replace-abandoned-eslint-import-resolver-exports
deleted file mode 100644
index 255a37584b603..0000000000000
--- a/projects/plugins/crm/changelog/update-replace-abandoned-eslint-import-resolver-exports
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Adjust orders of JS imports in various files for new eslint config. Should make no difference to functionality.
-
-
diff --git a/projects/plugins/crm/changelog/update-switch-to-raw-coverage-files b/projects/plugins/crm/changelog/update-switch-to-raw-coverage-files
deleted file mode 100644
index bfd48f31ebc60..0000000000000
--- a/projects/plugins/crm/changelog/update-switch-to-raw-coverage-files
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Generate raw phpunit and/or jest coverage data instead of clover.
-
-
diff --git a/projects/plugins/crm/changelog/update-tested-to-6-7 b/projects/plugins/crm/changelog/update-tested-to-6-7
deleted file mode 100644
index 9c1d5b4fabb5f..0000000000000
--- a/projects/plugins/crm/changelog/update-tested-to-6-7
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-General: indicate compatibility with the upcoming version of WordPress - 6.7.
diff --git a/projects/plugins/crm/changelog/update-various-eslint-plugins b/projects/plugins/crm/changelog/update-various-eslint-plugins
deleted file mode 100644
index b98fdbffe73bd..0000000000000
--- a/projects/plugins/crm/changelog/update-various-eslint-plugins
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Update code to fix new eslint rules.
-
-
diff --git a/projects/plugins/crm/composer.json b/projects/plugins/crm/composer.json
index de79afc121a6f..9b764e3c0e24b 100644
--- a/projects/plugins/crm/composer.json
+++ b/projects/plugins/crm/composer.json
@@ -45,7 +45,7 @@
]
},
"config": {
- "autoloader-suffix": "06c775433a83ed276f0a1d8ac25f93ba_crmⓥ6_4_4",
+ "autoloader-suffix": "06c775433a83ed276f0a1d8ac25f93ba_crmⓥ6_5_0",
"allow-plugins": {
"automattic/jetpack-autoloader": true,
"automattic/jetpack-composer-plugin": true,
diff --git a/projects/plugins/crm/composer.lock b/projects/plugins/crm/composer.lock
index ff27adf7a0f9d..688602919861a 100644
--- a/projects/plugins/crm/composer.lock
+++ b/projects/plugins/crm/composer.lock
@@ -1846,16 +1846,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.1",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
"shasum": ""
},
"require": {
@@ -1898,9 +1898,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
},
- "time": "2024-10-08T18:51:32+00:00"
+ "time": "2024-12-30T11:07:19+00:00"
},
{
"name": "phar-io/manifest",
@@ -2773,16 +2773,16 @@
},
{
"name": "psy/psysh",
- "version": "v0.12.6",
+ "version": "v0.12.7",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "3b5ea0efaa791cd1c65ecc493aec3e2aa55ff57c"
+ "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/3b5ea0efaa791cd1c65ecc493aec3e2aa55ff57c",
- "reference": "3b5ea0efaa791cd1c65ecc493aec3e2aa55ff57c",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
+ "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
"shasum": ""
},
"require": {
@@ -2846,9 +2846,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
- "source": "https://github.com/bobthecow/psysh/tree/v0.12.6"
+ "source": "https://github.com/bobthecow/psysh/tree/v0.12.7"
},
- "time": "2024-12-07T20:08:52+00:00"
+ "time": "2024-12-10T01:58:33+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -3927,16 +3927,16 @@
},
{
"name": "symfony/console",
- "version": "v7.2.0",
+ "version": "v7.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf"
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
+ "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
"shasum": ""
},
"require": {
@@ -4000,7 +4000,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.2.0"
+ "source": "https://github.com/symfony/console/tree/v7.2.1"
},
"funding": [
{
@@ -4016,7 +4016,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-06T14:24:19+00:00"
+ "time": "2024-12-11T03:49:26+00:00"
},
{
"name": "symfony/css-selector",
@@ -4102,12 +4102,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4317,12 +4317,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4375,16 +4375,16 @@
},
{
"name": "symfony/finder",
- "version": "v7.2.0",
+ "version": "v7.2.2",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49"
+ "reference": "87a71856f2f56e4100373e92529eed3171695cfb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/6de263e5868b9a137602dd1e33e4d48bfae99c49",
- "reference": "6de263e5868b9a137602dd1e33e4d48bfae99c49",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/87a71856f2f56e4100373e92529eed3171695cfb",
+ "reference": "87a71856f2f56e4100373e92529eed3171695cfb",
"shasum": ""
},
"require": {
@@ -4419,7 +4419,7 @@
"description": "Finds files and directories via an intuitive fluent interface",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/finder/tree/v7.2.0"
+ "source": "https://github.com/symfony/finder/tree/v7.2.2"
},
"funding": [
{
@@ -4435,7 +4435,7 @@
"type": "tidelift"
}
],
- "time": "2024-10-23T06:56:12+00:00"
+ "time": "2024-12-30T19:00:17+00:00"
},
{
"name": "symfony/polyfill-ctype",
@@ -4701,8 +4701,8 @@
"type": "library",
"extra": {
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -4840,12 +4840,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -5193,16 +5193,16 @@
},
{
"name": "yoast/phpunit-polyfills",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be"
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
+ "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
"shasum": ""
},
"require": {
@@ -5252,7 +5252,7 @@
"security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
"source": "https://github.com/Yoast/PHPUnit-Polyfills"
},
- "time": "2024-09-06T22:03:10+00:00"
+ "time": "2025-01-08T16:58:34+00:00"
}
],
"aliases": [],
diff --git a/projects/plugins/crm/includes/ZeroBSCRM.API.php b/projects/plugins/crm/includes/ZeroBSCRM.API.php
index 460466f559129..50f397b7d55a8 100644
--- a/projects/plugins/crm/includes/ZeroBSCRM.API.php
+++ b/projects/plugins/crm/includes/ZeroBSCRM.API.php
@@ -37,20 +37,17 @@ function zeroBS_api_rewrite_endpoint() {
* Process the query and get page and items per page
*/
function jpcrm_api_process_pagination() {
+ // phpcs:disable WordPress.Security.NonceVerification.Recommended
+ $page = isset( $_GET['page'] ) ? max( (int) $_GET['page'], 1 ) : 1;
+ $per_page = isset( $_GET['perpage'] ) ? max( (int) $_GET['perpage'], 1 ) : 10;
+ $order = strtoupper( $_GET['order'] ?? '' ) === 'ASC' ? 'ASC' : 'DESC'; // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+ // phpcs:enable WordPress.Security.NonceVerification.Recommended
- if ( isset( $_GET['page'] ) && (int) $_GET['page'] >= 0 ) {
- $page = (int) $_GET['page'];
- } else {
- $page = 0;
- }
-
- if ( isset( $_GET['perpage'] ) && (int) $_GET['perpage'] >= 0 ) {
- $per_page = (int) $_GET['perpage'];
- } else {
- $per_page = 10;
- }
-
- return array( $page, $per_page );
+ return array(
+ 'page' => $page,
+ 'per_page' => $per_page,
+ 'order' => $order,
+ );
}
/**
diff --git a/projects/plugins/crm/includes/ZeroBSCRM.Core.php b/projects/plugins/crm/includes/ZeroBSCRM.Core.php
index 7a041e26fff90..1a7add23184a4 100644
--- a/projects/plugins/crm/includes/ZeroBSCRM.Core.php
+++ b/projects/plugins/crm/includes/ZeroBSCRM.Core.php
@@ -1633,8 +1633,10 @@ public function preInit() {
$this->dependency_checker = new JPCRM_DependencyChecker();
// load feature sniffer to alert user to available integrations
+ ##WLREMOVE
$this->feature_sniffer = new JPCRM_FeatureSniffer();
$this->jpcrm_sniff_features();
+ ##/WLREMOVE
// load WordPress User integrations
$this->wordpress_user_integration = new Automattic\JetpackCRM\Wordpress_User_Integration();
diff --git a/projects/plugins/crm/includes/ZeroBSCRM.InvoiceBuilder.php b/projects/plugins/crm/includes/ZeroBSCRM.InvoiceBuilder.php
index 5610f26a62869..0ae623853d85e 100644
--- a/projects/plugins/crm/includes/ZeroBSCRM.InvoiceBuilder.php
+++ b/projects/plugins/crm/includes/ZeroBSCRM.InvoiceBuilder.php
@@ -1000,11 +1000,11 @@ function zeroBSCRM_invoicing_generateInvoiceHTML( $invoice_id = -1, $template =
// due to withTotals parameter on get above, we now don't need ot calc anything here, just expose
$totals_table = '';
- $totals_table .= '';
+ $totals_table .= '';
if ( $invsettings['invtax'] != 0 || $invsettings['invpandp'] != 0 || $invsettings['invdis'] != 0 ) { // phpcs:ignore Universal.Operators.StrictComparisons.LooseNotEqual
$totals_table .= '';
$totals_table .= '| ' . esc_html__( 'Subtotal', 'zero-bs-crm' ) . ' | ';
- $totals_table .= '';
+ $totals_table .= ' | ';
if ( isset( $invoice['net'] ) && ! empty( $invoice['net'] ) ) {
$totals_table .= esc_html( zeroBSCRM_formatCurrency( $invoice['net'] ) );
} else {
@@ -1094,7 +1094,7 @@ function zeroBSCRM_invoicing_generateInvoiceHTML( $invoice_id = -1, $template =
$totals_table .= '
| ' . __( 'Total', 'zero-bs-crm' ) . ' |
- ';
+ | ';
if ( isset( $invoice['total'] ) && ! empty( $invoice['total'] ) ) {
$totals_table .= esc_html( zeroBSCRM_formatCurrency( $invoice['total'] ) );
} else {
@@ -1109,9 +1109,9 @@ function zeroBSCRM_invoicing_generateInvoiceHTML( $invoice_id = -1, $template =
$partials_table = '';
if ( $invoice['total'] == 0 ) { // phpcs:ignore Universal.Operators.StrictComparisons.LooseEqual
- $partials_table .= '';
+ $partials_table .= '';
} else {
- $partials_table .= '';
+ $partials_table .= '';
}
$balance = $invoice['total'];
@@ -1136,8 +1136,8 @@ function zeroBSCRM_invoicing_generateInvoiceHTML( $invoice_id = -1, $template =
$balance = $balance - $partial['total'];
}
- $partials_table .= '';
- $partials_table .= '' . esc_html__( 'Payment', 'zero-bs-crm' ) . '
(' . esc_html( $partial['ref'] ) . ') | ';
+ $partials_table .= ' ';
+ $partials_table .= '| ' . esc_html( $partial['ref'] ) . ' | ';
$partials_table .= '';
if ( ! empty( $partial['total'] ) ) {
$partials_table .= esc_html( zeroBSCRM_formatCurrency( $partial['total'] ) );
@@ -1158,7 +1158,7 @@ function zeroBSCRM_invoicing_generateInvoiceHTML( $invoice_id = -1, $template =
$partials_table .= '';
$partials_table .= '| ' . esc_html__( 'Amount due', 'zero-bs-crm' ) . ' | ';
- $partials_table .= '' . esc_html( zeroBSCRM_formatCurrency( $balance ) ) . ' | ';
+ $partials_table .= '' . esc_html( zeroBSCRM_formatCurrency( $balance ) ) . ' | ';
$partials_table .= ' ';
$partials_table .= ' | ';
@@ -1573,9 +1573,9 @@ function zeroBSCRM_invoicing_generateInvPart_lineitems( $invlines = array() ) {
$line_item_html .= '
' . esc_html( $invline['title'] ) . '
' . nl2br( esc_html( $invline['desc'] ) ) . ' |
- ' . esc_html( zeroBSCRM_format_quantity( $invline['quantity'] ) ) . ' |
- ' . esc_html( zeroBSCRM_formatCurrency( $invline['price'] ) ) . ' |
- ' . esc_html( zeroBSCRM_formatCurrency( $invline['net'] ) ) . ' |
+ ' . esc_html( zeroBSCRM_format_quantity( $invline['quantity'] ) ) . ' |
+ ' . esc_html( zeroBSCRM_formatCurrency( $invline['price'] ) ) . ' |
+ ' . esc_html( zeroBSCRM_formatCurrency( $invline['net'] ) ) . ' |
';
}
diff --git a/projects/plugins/crm/includes/ZeroBSCRM.List.Views.php b/projects/plugins/crm/includes/ZeroBSCRM.List.Views.php
index 3d02984ceebde..bfd933ed37f7f 100644
--- a/projects/plugins/crm/includes/ZeroBSCRM.List.Views.php
+++ b/projects/plugins/crm/includes/ZeroBSCRM.List.Views.php
@@ -198,34 +198,6 @@ function zeroBSCRM_render_invoiceslist_page() { // phpcs:ignore WordPress.Naming
global $zbs;
$upsell_box_html = '';
- $bundle = false;
- if ( $zbs->hasEntrepreneurBundleMin() ) {
- $bundle = true;
- }
-
- if ( ! zeroBSCRM_isExtensionInstalled( 'invpro' ) ) {
- if ( ! $bundle ) {
- $upsell_box_html = '';
-
- $up_title = esc_html__( 'Supercharged Invoicing', 'zero-bs-crm' );
- $up_desc = esc_html__( 'Get more out of invoicing, like accepting online payments!', 'zero-bs-crm' );
- $up_button = esc_html__( 'Get Invoicing Pro', 'zero-bs-crm' );
- $up_target = $zbs->urls['invpro'];
-
- $upsell_box_html .= zeroBSCRM_UI2_squareFeedbackUpsell( $up_title, $up_desc, $up_button, $up_target );
- $upsell_box_html .= ' ';
- } else {
- $upsell_box_html = '';
-
- $up_title = esc_html__( 'Supercharged Invoicing', 'zero-bs-crm' );
- $up_desc = esc_html__( 'You have Invoicing Pro available because you are using a bundle. Please download and install from your account:', 'zero-bs-crm' );
- $up_button = esc_html__( 'Your Account', 'zero-bs-crm' );
- $up_target = $zbs->urls['account'];
-
- $upsell_box_html .= zeroBSCRM_UI2_squareFeedbackUpsell( $up_title, $up_desc, $up_button, $up_target );
- $upsell_box_html .= ' ';
- }
- }
$list = new zeroBSCRM_list(
array(
diff --git a/projects/plugins/crm/includes/ZeroBSCRM.PluginAdminNotices.php b/projects/plugins/crm/includes/ZeroBSCRM.PluginAdminNotices.php
index 3fd18543d84e2..989679aef462a 100644
--- a/projects/plugins/crm/includes/ZeroBSCRM.PluginAdminNotices.php
+++ b/projects/plugins/crm/includes/ZeroBSCRM.PluginAdminNotices.php
@@ -1,111 +1,64 @@
-hide_admin_pages`
-*/
-function jpcrm_autohide_admin_notices_for_specific_pages(){
-
- global $zbs;
-
- if ( isset( $zbs->hide_admin_pages ) && is_array( $zbs->hide_admin_pages ) ){
-
- if ( !empty( $zbs->zbsvar('page') ) && in_array( $zbs->zbsvar('page'), $zbs->hide_admin_pages ) ){
-
- remove_all_actions( 'admin_notices' );
-
- }
-
- }
-}
-
-
-
-// admin notices
-// show/hide admin notice :)
-//add_action( 'admin_notices', 'jpcrm_woo_promo_admin_notice' );
-function jpcrm_woo_promo_admin_notice(){
-
- global $zbs;
- $bundle = false; if ($zbs->hasFreelancerBundleMin()) $bundle = true;
-
- //default true if not set
- $display_status = get_option( 'jpcrm_hide_woo_promo', 'show' );
-
- /* Check transient, if available display notice */
- if ( current_user_can( 'activate_plugins' )){
-
- if(is_plugin_active( 'woocommerce/woocommerce.php' ) && zeroBSCRM_isAdminPage() && !zeroBSCRM_isExtensionInstalled('woosync') && !$bundle && $display_status != "hide"){
- jpcrm_woo_promo_admin_notice_banner();
- }
-
- }else{
-
- }
-
-}
-
-
-
/**
- * WooCommerce promo if running one
+ * This function blocks display of admin_notices on pages specified in `$zbs->hide_admin_pages`
*/
-function jpcrm_woo_promo_admin_notice_banner(){
+function jpcrm_autohide_admin_notices_for_specific_pages() {
+ global $zbs;
+ if ( isset( $zbs->hide_admin_pages ) && is_array( $zbs->hide_admin_pages ) ) {
+ if ( ! empty( $zbs->zbsvar( 'page' ) ) && in_array( $zbs->zbsvar( 'page' ), $zbs->hide_admin_pages, true ) ) {
+ remove_all_actions( 'admin_notices' );
+ }
+ }
}
+##WLREMOVE
/**
- * Usage Tracking
+ * Check if we should show Usage Tracking notice, and if so, trigger it.
*/
-
-add_action( 'admin_notices', 'jpcrm_usage_tracking_notice' );
-function jpcrm_usage_tracking_notice(){
-
- global $zbs;
-
- //default true if not set
- $display_status = get_option( 'jpcrm_hide_track_notice', 'show' );
- /* Check transient, if available display notice to admins */
- if ( current_user_can( 'activate_plugins' )){
-
- if(zeroBSCRM_isAdminPage() && $display_status != "hide"){
- jpcrm_usage_tracking_notice_banner();
- }
-
- }else{
-
- }
-
+function jpcrm_usage_tracking_notice() {
+ // default true if not set
+ $display_status = get_option( 'jpcrm_hide_track_notice', 'show' );
+ /* Check transient, if available display notice to admins */
+ if (
+ current_user_can( 'activate_plugins' )
+ && zeroBSCRM_isAdminPage()
+ && $display_status !== 'hide'
+ ) {
+ jpcrm_usage_tracking_notice_banner();
+ }
}
+add_action( 'admin_notices', 'jpcrm_usage_tracking_notice' );
-
-function jpcrm_usage_tracking_notice_banner(){
-
+/**
+ * Display usage tracking notice.
+ */
+function jpcrm_usage_tracking_notice_banner() {
global $zbs;
// don't show if wizard was completed
if ( get_option( 'jpcrm_wizard_completed' ) ) {
return;
}
-
?>
' + jpcrm.esc_html( dataLine.email ) + '';
+ '' +
+ jpcrm.esc_html( dataLine.email ) +
+ '';
}
let imgStr = '';
if ( typeof dataLine.avatar !== 'undefined' && dataLine.avatar != '' ) {
@@ -1853,7 +1857,7 @@ function zeroBSCRMJS_listView_generic_nameavatar( dataLine ) {
${ imgStr }
| `;
@@ -1915,7 +1919,7 @@ function zeroBSCRMJS_listView_generic_customer( dataLine ) {
${ imgStr }
| `;
@@ -1937,7 +1941,7 @@ function zeroBSCRMJS_listView_generic_customer( dataLine ) {
| `;
} else {
@@ -2557,7 +2561,11 @@ function zeroBSCRMJS_listView_customer_nameavatar( dataLine ) {
let emailStr = '';
if ( typeof dataLine.email !== 'undefined' && dataLine.email != '' ) {
emailStr =
- '' + jpcrm.esc_html( dataLine.email ) + '';
+ '' +
+ jpcrm.esc_html( dataLine.email ) +
+ '';
}
let imgStr = '';
if ( typeof dataLine.avatar !== 'undefined' && dataLine.avatar != '' ) {
@@ -2575,7 +2583,7 @@ function zeroBSCRMJS_listView_customer_nameavatar( dataLine ) {
${ imgStr }
| `;
@@ -3045,7 +3053,11 @@ function zeroBSCRMJS_listView_company_nameavatar( dataLine ) {
let emailStr = '';
if ( typeof dataLine.email !== 'undefined' && dataLine.email != '' ) {
emailStr =
- '' + jpcrm.esc_html( dataLine.email ) + '';
+ '' +
+ jpcrm.esc_html( dataLine.email ) +
+ '';
}
let imgStr = '';
if ( typeof dataLine.avatar !== 'undefined' && dataLine.avatar != '' ) {
@@ -3065,8 +3077,8 @@ function zeroBSCRMJS_listView_company_nameavatar( dataLine ) {
const td = `
${ imgStr }
- | `;
diff --git a/projects/plugins/crm/package.json b/projects/plugins/crm/package.json
index 3de41eae9ddd4..23915120fca2e 100644
--- a/projects/plugins/crm/package.json
+++ b/projects/plugins/crm/package.json
@@ -1,6 +1,6 @@
{
"name": "@automattic/jetpack-crm",
- "version": "6.4.4",
+ "version": "6.5.0",
"description": "The CRM for WordPress",
"author": "Automattic",
"license": "GPL-2.0",
diff --git a/projects/plugins/crm/readme.txt b/projects/plugins/crm/readme.txt
index 85fc40e13a5de..c0187822be163 100644
--- a/projects/plugins/crm/readme.txt
+++ b/projects/plugins/crm/readme.txt
@@ -362,11 +362,20 @@ We offer a full, no-hassle refund within 14 days. You can read more about that,
== Changelog ==
-### 6.4.4 - 2024-08-07
+### [6.5.0] - 2025-01-10
#### Removed
-- MailPoet: Remove unused MailPoet use statements.
+- General: Remove unused legacy code.
-#### Fixed
-- WooSync: Fix a warning message on sync and fatal error when a fee value is not a number
+#### Changed
+- General: Update minimum WordPress version to 6.6.
+- API: Allow sort order in endpoints.
+#### Fixed
+- CRM: Fix bug which caused duplicated queries to run.
+- CRM: Fix a fatal error that occurred when exporting contacts with a custom field that had the same name as a linked field (e.g., 'company').
+- Dashboard: Fix an issue where the CRM contacts graph displayed incorrect values in some instances.
+- Dashboard: Show correct avatar for recent activity.
+- Invoices: Fix bugs in the default PDF template and other fixes. Created a new template to maintain backwards compatibility.
+- Code: Ensure we use Jetpack Autoloader throughout the codebase.
+- Migrations: Improve WP Playground compatibility.
diff --git a/projects/plugins/crm/sass/ZeroBSCRM.admin.invoicebuilder.scss b/projects/plugins/crm/sass/ZeroBSCRM.admin.invoicebuilder.scss
index 74cedb00abba6..9413bca13bc0f 100644
--- a/projects/plugins/crm/sass/ZeroBSCRM.admin.invoicebuilder.scss
+++ b/projects/plugins/crm/sass/ZeroBSCRM.admin.invoicebuilder.scss
@@ -114,10 +114,15 @@
margin-right:1%;
}
.invoice-discount-total{
- margin-top:-6px;
+ margin-top:-9px;
}
#invoice_discount_total{
float:left;
+ width: 32% !important;
+ }
+ #invoice_postage_total{
+ width: 32%;
+ float:right;
}
.half{
width:50%;
@@ -182,10 +187,15 @@
margin-right:1%;
}
.invoice-discount-total{
- margin-top:-6px;
+ margin-top:-9px;
}
#invoice_discount_total{
float:left;
+ width: 32% !important;
+ }
+ #invoice_postage_total{
+ width: 32%;
+ float:right;
}
.half{
width:50%;
diff --git a/projects/plugins/crm/sass/_ZeroBSCRM.listview.scss b/projects/plugins/crm/sass/_ZeroBSCRM.listview.scss
index ec0f3a40d4d7f..ea4f7de2a5eb3 100644
--- a/projects/plugins/crm/sass/_ZeroBSCRM.listview.scss
+++ b/projects/plugins/crm/sass/_ZeroBSCRM.listview.scss
@@ -148,3 +148,7 @@
text-align: right;
margin-bottom: 10px;
}
+
+.jpcrm-listview-table-container .jpcrm-listview-table a.name{
+ font-weight: 700;
+}
diff --git a/projects/plugins/crm/sass/emerald/_listview-table.scss b/projects/plugins/crm/sass/emerald/_listview-table.scss
index 0d5d1992e7d38..ddebead06f247 100644
--- a/projects/plugins/crm/sass/emerald/_listview-table.scss
+++ b/projects/plugins/crm/sass/emerald/_listview-table.scss
@@ -24,6 +24,16 @@
padding: 10px;
}
+ .name{
+ font-weight: 500;
+ font-size: 14px;
+ }
+ .email{
+ color: #3C434A;
+ font-weight: 400;
+ font-size: 12px;
+ }
+
/* min-width except for checkbox column */
th:not(:first-child), td:not(:first-child) {
min-width: 120px;
diff --git a/projects/plugins/crm/templates/invoices/invoice-pdf-template-modern.html b/projects/plugins/crm/templates/invoices/invoice-pdf-template-modern.html
new file mode 100644
index 0000000000000..73cd8cfcf9d6b
--- /dev/null
+++ b/projects/plugins/crm/templates/invoices/invoice-pdf-template-modern.html
@@ -0,0 +1,335 @@
+
+
+
+
+
+ Invoice
+
+
+
+
+
+
+
+
+
+
+ ##INVOICE-LABEL-FROM##
+ ##BIZ-INFO##
+
+
+
+ ##INVOICE-LABEL-TO##
+ ##INVOICE-CUSTOMER-INFO##
+
+
+
+
+
+
+
+ ##INVOICE-LINE-ITEMS##
+
+
+
+ ##INVOICE-TOTALS-TABLE##
+
+
+
+
+ | ##PRE-INVOICE-PAYMENT-DETAILS## |
+ ##INVOICE-PARTIALS-TABLE## |
+
+
+
+
+
+ ##INVOICE-PAYMENT-DETAILS##
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ }
+ />
+ }
+ />
+ } />
+ } />
+ } />
+ }
+ />
+ }
+ />
+ }
+ />
+ }
+ />
+ } />
+ }
+ />
+ }
+ />
+ }
+ />
+ } />
+ } />
+ } />
+ }
+ />
+ } />
+ } />
+ } />
+ } />
+
diff --git a/projects/plugins/jetpack/_inc/client/at-a-glance/boost/index.jsx b/projects/plugins/jetpack/_inc/client/at-a-glance/boost/index.jsx
index 407f5b551243c..039f1b3fd5b97 100644
--- a/projects/plugins/jetpack/_inc/client/at-a-glance/boost/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/at-a-glance/boost/index.jsx
@@ -176,7 +176,7 @@ const DashBoost = ( {
'jetpack'
),
bottom: __(
- 'Jetpack Boost enhance your site’s performance like top websites, no developer needed.',
+ 'Jetpack Boost enhances your site’s performance like top websites, no developer needed.',
'jetpack'
),
};
@@ -201,11 +201,17 @@ const DashBoost = ( {
return createInterpolateElement(
__(
- 'Re-generate your Critical CSS after you make changes on your site',
+ 'Regenerate your Critical CSS after making changes to your site',
'jetpack'
),
{
- a: ,
+ a: (
+
+ ),
+ u: ,
Info: ,
}
);
@@ -517,7 +523,7 @@ const CriticalCssInfoPopover = () => {
screenReaderText={ __( 'Learn more about how critical CSS works', 'jetpack' ) }
>
- { __( 'Regenerate Critical CSS', 'jetpack' ) }
+ { __( 'Get automated Critical CSS', 'jetpack' ) }
{ createInterpolateElement(
diff --git a/projects/plugins/jetpack/_inc/client/at-a-glance/style.scss b/projects/plugins/jetpack/_inc/client/at-a-glance/style.scss
index 5e5a65517d19b..cd8ac4f3ef4cd 100644
--- a/projects/plugins/jetpack/_inc/client/at-a-glance/style.scss
+++ b/projects/plugins/jetpack/_inc/client/at-a-glance/style.scss
@@ -751,3 +751,10 @@ a.jp-dash-item__manage-in-wpcom,
display: block;
}
}
+
+// We only underline part of the link to Critical CSS info.
+.dops-banner__title {
+ a.dash-boost-critical-css-info__text {
+ text-decoration: none;
+ }
+}
diff --git a/projects/plugins/jetpack/_inc/client/components/apps-card/index.jsx b/projects/plugins/jetpack/_inc/client/components/apps-card/index.jsx
index 7863ef05f4253..de0418bb1923b 100644
--- a/projects/plugins/jetpack/_inc/client/components/apps-card/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/apps-card/index.jsx
@@ -4,7 +4,7 @@ import { __ } from '@wordpress/i18n';
import clsx from 'clsx';
import PropTypes from 'prop-types';
import React from 'react';
-import { withRouter } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
import AppsBadge from 'components/apps-badge';
import Card from 'components/card';
import { imagePath } from 'constants/urls';
@@ -115,4 +115,4 @@ AppsCard.propTypes = {
className: PropTypes.string,
};
-export default withRouter( AppsCard );
+export default props => ;
diff --git a/projects/plugins/jetpack/_inc/client/components/jetpack-notices/index.jsx b/projects/plugins/jetpack/_inc/client/components/jetpack-notices/index.jsx
index 3abd343f7360c..5907f13155772 100644
--- a/projects/plugins/jetpack/_inc/client/components/jetpack-notices/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/jetpack-notices/index.jsx
@@ -4,7 +4,7 @@ import { __, sprintf } from '@wordpress/i18n';
import PropTypes from 'prop-types';
import React from 'react';
import { connect } from 'react-redux';
-import { withRouter } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
import { SocialLogo } from 'social-logos';
import ConnectionBanner from 'components/connection-banner';
import NoticesList from 'components/global-notices';
@@ -207,7 +207,7 @@ class JetpackNotices extends React.Component {
siteConnectionStatus={ this.props.siteConnectionStatus }
siteOfflineMode={ this.props.siteOfflineMode }
/>
-
+
{ ! this.props.isReconnectingSite &&
this.props.userCanConnectAccount &&
@@ -286,4 +286,4 @@ export default connect(
},
};
}
-)( withRouter( JetpackNotices ) );
+)( props => );
diff --git a/projects/plugins/jetpack/_inc/client/components/jetpack-notices/plan-conflict-warning.jsx b/projects/plugins/jetpack/_inc/client/components/jetpack-notices/plan-conflict-warning.jsx
index f5ae996470113..e51caa6074542 100644
--- a/projects/plugins/jetpack/_inc/client/components/jetpack-notices/plan-conflict-warning.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/jetpack-notices/plan-conflict-warning.jsx
@@ -1,16 +1,19 @@
import { __, sprintf } from '@wordpress/i18n';
-import React from 'react';
import { connect } from 'react-redux';
-import { withRouter } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
import SimpleNotice from 'components/notice';
import { getActiveSitePurchases } from 'state/site';
/**
* PlanConflictWarning component
*
+ * @param {object} root0 - props
+ * @param {Array} root0.activeSitePurchases - active site purchases
* @return {object} component
*/
-export function PlanConflictWarning( { activeSitePurchases, location: { pathname } } ) {
+export function PlanConflictWarning( { activeSitePurchases } ) {
+ const { pathname } = useLocation();
+
// Only show on plans page.
if ( '/plans' !== pathname ) {
return null;
@@ -77,8 +80,6 @@ export function PlanConflictWarning( { activeSitePurchases, location: { pathname
);
}
-const PlanConflictWarningWithRouter = withRouter( PlanConflictWarning );
-
export default connect( state => ( {
activeSitePurchases: getActiveSitePurchases( state ),
-} ) )( PlanConflictWarningWithRouter );
+} ) )( PlanConflictWarning );
diff --git a/projects/plugins/jetpack/_inc/client/components/jetpack-notices/test/component.js b/projects/plugins/jetpack/_inc/client/components/jetpack-notices/test/component.js
index c98bb8a4f0a1e..9388a0336c8e0 100644
--- a/projects/plugins/jetpack/_inc/client/components/jetpack-notices/test/component.js
+++ b/projects/plugins/jetpack/_inc/client/components/jetpack-notices/test/component.js
@@ -1,11 +1,31 @@
import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
import { render, screen } from 'test/test-utils';
import { DevVersionNotice } from '../index';
import { PlanConflictWarning } from '../plan-conflict-warning';
-describe( 'PlanConflictWarning', () => {
- const location = { pathname: '/plans' };
+/**
+ * Wrap the component in a `` for testing.
+ *
+ * @param {PlanConflictWarning} component - The `` to wrap.
+ * @param {string[]} entries - Initial path entries.
+ * @return {MemoryRouter} Router to render..
+ */
+function wrapWithMemoryRouter( component, entries = [ '/plans' ] ) {
+ return (
+
+ { component }
+
+ );
+}
+describe( 'PlanConflictWarning', () => {
const personalPlan = {
product_slug: 'jetpack_personal',
product_name: 'Jetpack Personal',
@@ -27,44 +47,43 @@ describe( 'PlanConflictWarning', () => {
};
it( 'should not render when not in correct path', () => {
- const { container } = render( );
+ const { container } = render( wrapWithMemoryRouter( , [ '/test' ] ) );
expect( container ).toBeEmptyDOMElement();
} );
it( 'should not render when there are no purchases', () => {
const { container } = render(
-
+ wrapWithMemoryRouter( )
);
expect( container ).toBeEmptyDOMElement();
} );
it( 'should not render when there is one purchase', () => {
const { container } = render(
-
+ wrapWithMemoryRouter( )
);
expect( container ).toBeEmptyDOMElement();
} );
it( 'should not render when there is no backup purchase', () => {
const { container } = render(
-
+ wrapWithMemoryRouter( )
);
expect( container ).toBeEmptyDOMElement();
} );
it( 'should not render when there is no site plan purchase', () => {
const { container } = render(
-
+ wrapWithMemoryRouter( )
);
expect( container ).toBeEmptyDOMElement();
} );
it( 'should not render with both real-time backups and a non-professional plan', () => {
const { container } = render(
-
+ wrapWithMemoryRouter(
+
+ )
);
expect( container ).toBeEmptyDOMElement();
} );
@@ -75,20 +94,18 @@ describe( 'PlanConflictWarning', () => {
...realTimeBackups,
};
const { container } = render(
-
+ wrapWithMemoryRouter(
+
+ )
);
expect( container ).toBeEmptyDOMElement();
} );
it( 'should show warning with both daily backups and a plan', () => {
render(
-
+ wrapWithMemoryRouter(
+
+ )
);
expect(
screen.getByText(
@@ -101,10 +118,9 @@ describe( 'PlanConflictWarning', () => {
it( 'should show warning with both real-time backups and a Professional plan', () => {
render(
-
+ wrapWithMemoryRouter(
+
+ )
);
expect(
screen.getByText(
diff --git a/projects/plugins/jetpack/_inc/client/components/navigation-settings/index.jsx b/projects/plugins/jetpack/_inc/client/components/navigation-settings/index.jsx
index ea620587e6a5f..da60e1b8b2701 100644
--- a/projects/plugins/jetpack/_inc/client/components/navigation-settings/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/navigation-settings/index.jsx
@@ -4,7 +4,7 @@ import { noop } from 'lodash';
import PropTypes from 'prop-types';
import React from 'react';
import { connect } from 'react-redux';
-import { withRouter } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
import QuerySitePlugins from 'components/data/query-site-plugins';
import Search from 'components/search';
import SectionNav from 'components/section-nav';
@@ -37,9 +37,14 @@ export class NavigationSettings extends React.Component {
};
UNSAFE_componentWillMount() {
- // We need to handle the search term not only on route update but also on page load in case of some external redirects
+ // We need to handle the search term not only on route update but also on page load in case of some external redirects.
this.onRouteChange( this.props.location );
- this.props.history.listen( this.onRouteChange );
+ }
+
+ componentDidUpdate( oldprops ) {
+ if ( oldprops.location !== this.props.location ) {
+ this.onRouteChange( this.props.location );
+ }
}
UNSAFE_componentWillReceiveProps( nextProps ) {
@@ -309,4 +314,4 @@ export default connect(
dispatch => ( {
searchForTerm: term => dispatch( filterSearch( term ) ),
} )
-)( withRouter( NavigationSettings ) );
+)( props => );
diff --git a/projects/plugins/jetpack/_inc/client/components/navigation/index.jsx b/projects/plugins/jetpack/_inc/client/components/navigation/index.jsx
index ff785e159ac77..052bbad69397a 100644
--- a/projects/plugins/jetpack/_inc/client/components/navigation/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/navigation/index.jsx
@@ -5,7 +5,7 @@ import clsx from 'clsx';
import PropTypes from 'prop-types';
import React from 'react';
import { connect } from 'react-redux';
-import { withRouter } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
import SectionNav from 'components/section-nav';
import NavItem from 'components/section-nav/item';
import NavTabs from 'components/section-nav/tabs';
@@ -194,4 +194,4 @@ export default connect( state => {
adminUrl: getSiteAdminUrl( state ),
purchaseToken: getPurchaseToken( state ),
};
-} )( withRouter( Navigation ) );
+} )( props => );
diff --git a/projects/plugins/jetpack/_inc/client/components/non-admin-view/index.jsx b/projects/plugins/jetpack/_inc/client/components/non-admin-view/index.jsx
index d3641a6920512..165253e3b6823 100644
--- a/projects/plugins/jetpack/_inc/client/components/non-admin-view/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/components/non-admin-view/index.jsx
@@ -25,7 +25,7 @@ class NonAdminView extends React.Component {
switch ( route ) {
case '/dashboard':
default:
- this.props.history.replace( '/dashboard' );
+ this.props.navigate( '/dashboard', { replace: true } );
pageComponent = ;
break;
case '/settings':
diff --git a/projects/plugins/jetpack/_inc/client/main.jsx b/projects/plugins/jetpack/_inc/client/main.jsx
index 8fd164b4f9f97..b538b29f8e58e 100644
--- a/projects/plugins/jetpack/_inc/client/main.jsx
+++ b/projects/plugins/jetpack/_inc/client/main.jsx
@@ -9,7 +9,7 @@ import { __, sprintf } from '@wordpress/i18n';
import jQuery from 'jquery';
import React from 'react';
import { connect } from 'react-redux';
-import { withRouter, Prompt } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
import AtAGlance from 'at-a-glance/index.jsx';
import AdminNotices from 'components/admin-notices';
import AppsCard from 'components/apps-card';
@@ -193,10 +193,13 @@ class Main extends React.Component {
! this.props.hasSeenWCConnectionModal &&
this.props.userCanManageModules
) {
- this.props.history.replace( {
- pathname: '/woo-setup',
- state: { previousPath: this.props.location.pathname },
- } );
+ this.props.navigate(
+ {
+ pathname: '/woo-setup',
+ state: { previousPath: this.props.location.pathname },
+ },
+ { replace: true }
+ );
}
}
@@ -514,7 +517,7 @@ class Main extends React.Component {
break;
case '/setup':
if ( this.props.isSiteConnected ) {
- this.props.history.replace( '/dashboard' );
+ this.props.navigate( '/dashboard', { replace: true } );
pageComponent = this.getAtAGlance();
}
break;
@@ -566,7 +569,7 @@ class Main extends React.Component {
/>
);
} else {
- this.props.history.replace( '/dashboard' );
+ this.props.navigate( '/dashboard', { replace: true } );
pageComponent = this.getAtAGlance();
}
break;
@@ -613,7 +616,7 @@ class Main extends React.Component {
if ( this.props.showRecommendations ) {
pageComponent = ;
} else {
- this.props.history.replace( '/dashboard' );
+ this.props.navigate( '/dashboard', { replace: true } );
pageComponent = this.getAtAGlance();
}
break;
@@ -623,7 +626,7 @@ class Main extends React.Component {
break;
}
- this.props.history.replace( '/dashboard' );
+ this.props.navigate( '/dashboard', { replace: true } );
pageComponent = this.getAtAGlance();
break;
}
@@ -726,7 +729,7 @@ class Main extends React.Component {
}
closeReconnectModal() {
- this.props.history.replace( '/dashboard' );
+ this.props.navigate( '/dashboard', { replace: true } );
}
/**
@@ -773,7 +776,7 @@ class Main extends React.Component {
*/
connectUser() {
this.props.resetConnectUser();
- this.props.history.replace( '/connect-user' );
+ this.props.navigate( '/connect-user', { replace: true } );
}
/**
@@ -854,10 +857,15 @@ class Main extends React.Component {
{ this.shouldConnectUser() && this.connectUser() }
+ { /*
+ This component was removed as of react-router-dom v6: https://github.com/remix-run/react-router/issues/8139
+ It could probably be brought back with `unstable_usePrompt`, but that is broken with the hash router and normal links,
+ and is already not reliable cross-browser anyway.
+ */ }
{ this.renderMainContent( this.props.location.pathname ) }
{ this.shouldShowJetpackManageBanner() && (
@@ -958,7 +966,7 @@ export default connect(
dispatch( CONNECTION_STORE_ID ).setConnectionStatus( connectionStatus );
},
};
- } )( withRouter( Main ) )
+ } )( props => )
);
// eslint-disable-next-line jsdoc/require-returns-check
diff --git a/projects/plugins/jetpack/_inc/client/product-descriptions/index.jsx b/projects/plugins/jetpack/_inc/client/product-descriptions/index.jsx
index c9e5fa0eca561..30fdec058c6ef 100644
--- a/projects/plugins/jetpack/_inc/client/product-descriptions/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/product-descriptions/index.jsx
@@ -1,8 +1,7 @@
import { isEmpty } from 'lodash';
import PropTypes from 'prop-types';
-import React from 'react';
import { connect } from 'react-redux';
-import { Route, Switch } from 'react-router-dom';
+import { Route, Routes } from 'react-router-dom';
import QueryIntroOffers from 'components/data/query-intro-offers';
import QuerySiteProducts from 'components/data/query-site-products';
import { JetpackLoadingIcon } from 'components/jetpack-loading-icon';
@@ -35,9 +34,11 @@ const ProductDescriptions = props => {
}
routes.push(
-
-
-
+ }
+ />
);
} );
}
@@ -52,7 +53,7 @@ const ProductDescriptions = props => {
) : (
- { routes }
+ { routes }
) }
);
diff --git a/projects/plugins/jetpack/_inc/client/recommendations/index.jsx b/projects/plugins/jetpack/_inc/client/recommendations/index.jsx
index 5d33031efde07..e2d49a00b98ac 100644
--- a/projects/plugins/jetpack/_inc/client/recommendations/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/recommendations/index.jsx
@@ -1,8 +1,8 @@
import { getRedirectUrl } from '@automattic/jetpack-components';
import { __ } from '@wordpress/i18n';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
import { connect } from 'react-redux';
-import { Redirect, Route, Switch } from 'react-router-dom';
+import { Route, Routes, Navigate } from 'react-router-dom';
import QueryIntroOffers from 'components/data/query-intro-offers';
import QueryRecommendationsConditional from 'components/data/query-recommendations-conditional';
import QueryRecommendationsData from 'components/data/query-recommendations-data';
@@ -211,127 +211,129 @@ const RecommendationsComponent = props => {
) : (
-
- { /* TODO: Why we don't redirect improper step paths? */ }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ }
+ />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ } />
+ }
+ />
+ }
+ />
+ }
+ />
+ }
+ />
+ }
+ />
+ }
+ />
+ }
+ />
+ }
+ />
+ }
+ />
+ } />
+ }
+ />
+ }
+ />
+ }
+ />
+ }
+ />
+ }
+ />
+ } />
+ } />
+ }
+ />
+ }
+ />
+ }
+ />
+ }
+ />
+ }
+ />
+ } />
+ }
+ />
+ }
+ />
+ }
+ />
+ }
+ />
+ }
+ />
+ }
+ />
+ }
+ />
+
) }
diff --git a/projects/plugins/jetpack/_inc/client/recommendations/prompts/product-suggestions/index.jsx b/projects/plugins/jetpack/_inc/client/recommendations/prompts/product-suggestions/index.jsx
index 1641755388bf6..3be7c3f10f7b7 100644
--- a/projects/plugins/jetpack/_inc/client/recommendations/prompts/product-suggestions/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/recommendations/prompts/product-suggestions/index.jsx
@@ -1,7 +1,7 @@
import { __ } from '@wordpress/i18n';
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
import { connect } from 'react-redux';
-import { Redirect } from 'react-router-dom';
+import { Navigate } from 'react-router-dom';
import { JetpackLoadingIcon } from 'components/jetpack-loading-icon';
import { MoneyBackGuarantee } from 'components/money-back-guarantee';
import {
@@ -41,7 +41,7 @@ const ProductSuggestionsComponent = ( {
// We have to remove the first "#" value from the next route value
// so React Router will match it with one of the other recommendations paths.
// E.g. "#/recommendations/monitor" => "/recommendations/monitor".
- return ;
+ return ;
}
return (
diff --git a/projects/plugins/jetpack/_inc/client/settings/index.jsx b/projects/plugins/jetpack/_inc/client/settings/index.jsx
index f91e8854fdf6e..6b6e7dd0f6c51 100644
--- a/projects/plugins/jetpack/_inc/client/settings/index.jsx
+++ b/projects/plugins/jetpack/_inc/client/settings/index.jsx
@@ -2,7 +2,7 @@ import { GlobalNotices, ThemeProvider } from '@automattic/jetpack-components';
import { __, sprintf } from '@wordpress/i18n';
import React from 'react';
import { connect } from 'react-redux';
-import { withRouter } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
import Discussion from 'discussion';
import Earn from 'earn';
import Subscriptions from 'newsletter';
@@ -113,4 +113,4 @@ export default connect( state => {
return {
isModuleActivated: module => isModuleActivatedSelector( state, module ),
};
-} )( withRouter( Settings ) );
+} )( props => );
diff --git a/projects/plugins/jetpack/_inc/client/sharing/features/social-image-generator-section.jsx b/projects/plugins/jetpack/_inc/client/sharing/features/social-image-generator-section.jsx
index a38602f92add5..fd17e358677b3 100644
--- a/projects/plugins/jetpack/_inc/client/sharing/features/social-image-generator-section.jsx
+++ b/projects/plugins/jetpack/_inc/client/sharing/features/social-image-generator-section.jsx
@@ -16,7 +16,7 @@ const SocialImageGeneratorSection = () => {
{ __( 'Enable Social Image Generator', 'jetpack' ) }
{ __(
- 'With Social Image Generator enabled you can automatically generate social images for your posts. You can use the button below to choose a default template for new posts.',
+ 'With Social Image Generator enabled you can automatically generate social images for your posts. You can use the button below to choose a default template for new posts. This feature is only supported in the block editor.',
'jetpack'
) }
diff --git a/projects/plugins/jetpack/_inc/lib/core-api/class.jetpack-core-api-module-endpoints.php b/projects/plugins/jetpack/_inc/lib/core-api/class.jetpack-core-api-module-endpoints.php
index 9aa7ab1f03673..775f9c42b4126 100644
--- a/projects/plugins/jetpack/_inc/lib/core-api/class.jetpack-core-api-module-endpoints.php
+++ b/projects/plugins/jetpack/_inc/lib/core-api/class.jetpack-core-api-module-endpoints.php
@@ -1009,7 +1009,13 @@ function ( &$value ) {
$value = wp_kses(
$value,
array(
- 'a' => array(
+ 'ul' => array(),
+ 'li' => array(),
+ 'p' => array(),
+ 'strong' => array(),
+ 'ol' => array(),
+ 'em' => array(),
+ 'a' => array(
'href' => array(),
),
)
diff --git a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-email-preview.php b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-email-preview.php
index 0ece26ee6a872..525ae6caa34f1 100644
--- a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-email-preview.php
+++ b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-email-preview.php
@@ -6,10 +6,10 @@
*/
use Automattic\Jetpack\Connection\Manager;
+use Automattic\Jetpack\Connection\Traits\WPCOM_REST_API_Proxy_Request;
use Automattic\Jetpack\Extensions\Premium_Content\Subscription_Service\Abstract_Token_Subscription_Service;
use Automattic\Jetpack\Status\Host;
-require_once __DIR__ . '/trait-wpcom-rest-api-proxy-request-trait.php';
require_once JETPACK__PLUGIN_DIR . 'extensions/blocks/premium-content/_inc/subscription-service/include.php';
/**
@@ -19,7 +19,7 @@
*/
class WPCOM_REST_API_V2_Endpoint_Email_Preview extends WP_REST_Controller {
- use WPCOM_REST_API_Proxy_Request_Trait;
+ use WPCOM_REST_API_Proxy_Request;
/**
* Constructor.
diff --git a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-newsletter-categories-list.php b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-newsletter-categories-list.php
index d823a50f16dd4..f4910e8c32959 100644
--- a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-newsletter-categories-list.php
+++ b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-newsletter-categories-list.php
@@ -6,15 +6,14 @@
* @since 12.6
*/
+use Automattic\Jetpack\Connection\Traits\WPCOM_REST_API_Proxy_Request;
use Automattic\Jetpack\Status\Host;
-require_once __DIR__ . '/trait-wpcom-rest-api-proxy-request-trait.php';
-
/**
* Class WPCOM_REST_API_V2_Endpoint_Following
*/
class WPCOM_REST_API_V2_Endpoint_Newsletter_Categories_List extends WP_REST_Controller {
- use WPCOM_REST_API_Proxy_Request_Trait;
+ use WPCOM_REST_API_Proxy_Request;
/**
* Constructor.
diff --git a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-newsletter-categories-subscriptions-count.php b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-newsletter-categories-subscriptions-count.php
index e865e59a16228..82d4c65e1467d 100644
--- a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-newsletter-categories-subscriptions-count.php
+++ b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-newsletter-categories-subscriptions-count.php
@@ -6,15 +6,14 @@
* @since 12.6
*/
+use Automattic\Jetpack\Connection\Traits\WPCOM_REST_API_Proxy_Request;
use Automattic\Jetpack\Status\Host;
-require_once __DIR__ . '/trait-wpcom-rest-api-proxy-request-trait.php';
-
/**
* Class WPCOM_REST_API_V2_Endpoint_Newsletter_Categories_Subscriptions_Count
*/
class WPCOM_REST_API_V2_Endpoint_Newsletter_Categories_Subscriptions_Count extends WP_REST_Controller {
- use WPCOM_REST_API_Proxy_Request_Trait;
+ use WPCOM_REST_API_Proxy_Request;
/**
* Constructor.
diff --git a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-send-email-preview.php b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-send-email-preview.php
index 9b01e4ffbd87f..d1487938b4733 100644
--- a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-send-email-preview.php
+++ b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v2-endpoint-send-email-preview.php
@@ -6,17 +6,16 @@
*/
use Automattic\Jetpack\Connection\Manager;
+use Automattic\Jetpack\Connection\Traits\WPCOM_REST_API_Proxy_Request;
use Automattic\Jetpack\Status\Host;
-require_once __DIR__ . '/trait-wpcom-rest-api-proxy-request-trait.php';
-
/**
* Class WPCOM_REST_API_V2_Endpoint_Send_Email_Preview
* Handles the sending of email previews via the WordPress.com REST API
*/
class WPCOM_REST_API_V2_Endpoint_Send_Email_Preview extends WP_REST_Controller {
- use WPCOM_REST_API_Proxy_Request_Trait;
+ use WPCOM_REST_API_Proxy_Request;
/**
* Constructor.
diff --git a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v3-endpoint-blogging-prompts.php b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v3-endpoint-blogging-prompts.php
index cfede7814a9ef..58f3ea3789ce4 100644
--- a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v3-endpoint-blogging-prompts.php
+++ b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/class-wpcom-rest-api-v3-endpoint-blogging-prompts.php
@@ -5,15 +5,14 @@
* @package automattic/jetpack
*/
-// Ensure WPCOM_REST_API_Proxy_Request_Trait is present.
-require_once __DIR__ . '/trait-wpcom-rest-api-proxy-request-trait.php';
+use Automattic\Jetpack\Connection\Traits\WPCOM_REST_API_Proxy_Request;
/**
* REST API endpoint wpcom/v3/sites/%s/blogging-prompts.
*/
class WPCOM_REST_API_V3_Endpoint_Blogging_Prompts extends WP_REST_Posts_Controller {
- use WPCOM_REST_API_Proxy_Request_Trait;
+ use WPCOM_REST_API_Proxy_Request;
const TEMPLATE_BLOG_ID = 205876834;
diff --git a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/memberships.php b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/memberships.php
index 680f3a10b5705..59711d97b4479 100644
--- a/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/memberships.php
+++ b/projects/plugins/jetpack/_inc/lib/core-api/wpcom-endpoints/memberships.php
@@ -6,7 +6,7 @@
* @since 7.3.0
*/
-require_once __DIR__ . '/trait-wpcom-rest-api-proxy-request-trait.php';
+use Automattic\Jetpack\Connection\Traits\WPCOM_REST_API_Proxy_Request;
/**
* Class WPCOM_REST_API_V2_Endpoint_Memberships
@@ -14,7 +14,7 @@
*/
class WPCOM_REST_API_V2_Endpoint_Memberships extends WP_REST_Controller {
- use WPCOM_REST_API_Proxy_Request_Trait;
+ use WPCOM_REST_API_Proxy_Request;
/**
* WPCOM_REST_API_V2_Endpoint_Memberships constructor.
diff --git a/projects/plugins/jetpack/changelog/add-masterbar-watch b/projects/plugins/jetpack/changelog/add-masterbar-watch
new file mode 100644
index 0000000000000..bc6f12deb1ef9
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-masterbar-watch
@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+update composer.lock files
diff --git a/projects/plugins/jetpack/changelog/fix-author-widget-all-checkbox b/projects/plugins/jetpack/changelog/fix-author-widget-all-checkbox
deleted file mode 100644
index 31ef942ee49e0..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-author-widget-all-checkbox
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: bugfix
-
-Authors widget: Fix saving of unchecked "Display all authors" checkbox in the legacy widget editor.
diff --git a/projects/plugins/jetpack/changelog/fix-descript-icon-console-error b/projects/plugins/jetpack/changelog/fix-descript-icon-console-error
new file mode 100644
index 0000000000000..518b4ed74da9b
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-descript-icon-console-error
@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+Embeds: fix the Descript block variation icon svg path.
diff --git a/projects/plugins/jetpack/changelog/fix-image-cdn-double-encoding b/projects/plugins/jetpack/changelog/fix-image-cdn-double-encoding
new file mode 100644
index 0000000000000..101848bfb4810
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-image-cdn-double-encoding
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Photon: Fix double encoding image urls.
diff --git a/projects/plugins/jetpack/changelog/fix-sharing-dialog-location b/projects/plugins/jetpack/changelog/fix-sharing-dialog-location
new file mode 100644
index 0000000000000..305163f8beda8
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-sharing-dialog-location
@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Sharing: Fix the location of the sharing dialog, so it is not always the first sharing element on the page
diff --git a/projects/plugins/jetpack/changelog/fix-stats-setting-role-toggles b/projects/plugins/jetpack/changelog/fix-stats-setting-role-toggles
deleted file mode 100644
index eee7a6f4e22e0..0000000000000
--- a/projects/plugins/jetpack/changelog/fix-stats-setting-role-toggles
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: bugfix
-
-Fix custom roles settings are not sticking for Jetpack Stats
diff --git a/projects/plugins/jetpack/changelog/fix-upsell-nudge-safari b/projects/plugins/jetpack/changelog/fix-upsell-nudge-safari
new file mode 100644
index 0000000000000..53bd7b7d2c8fb
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-upsell-nudge-safari
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Block nudges: ensure clicking on a banner button leads to Plans page in Safari.
diff --git a/projects/js-packages/eslint-changed/changelog/renovate-commander-13.x b/projects/plugins/jetpack/changelog/renovate-lock-file-maintenance
similarity index 78%
rename from projects/js-packages/eslint-changed/changelog/renovate-commander-13.x
rename to projects/plugins/jetpack/changelog/renovate-lock-file-maintenance
index c47cb18e82997..1eaea6a769e84 100644
--- a/projects/js-packages/eslint-changed/changelog/renovate-commander-13.x
+++ b/projects/plugins/jetpack/changelog/renovate-lock-file-maintenance
@@ -1,4 +1,4 @@
Significance: patch
-Type: changed
+Type: other
Updated package dependencies.
diff --git a/projects/plugins/jetpack/changelog/update-forms-core-html-block b/projects/plugins/jetpack/changelog/update-forms-core-html-block
new file mode 100644
index 0000000000000..5b0f034a356cf
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-forms-core-html-block
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Forms: allow HTML block within forms
diff --git a/projects/plugins/jetpack/changelog/update-jetpack-ai-enable-feedback b/projects/plugins/jetpack/changelog/update-jetpack-ai-enable-feedback
deleted file mode 100644
index 75be9179cedb6..0000000000000
--- a/projects/plugins/jetpack/changelog/update-jetpack-ai-enable-feedback
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-Jetpack AI: Enable ratings feedback thumbs for all
diff --git a/projects/plugins/jetpack/changelog/update-move-wpcom-rest-api-proxy-request-trait b/projects/plugins/jetpack/changelog/update-move-wpcom-rest-api-proxy-request-trait
new file mode 100644
index 0000000000000..bf22379f80342
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-move-wpcom-rest-api-proxy-request-trait
@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+Moved WPCOM_REST_API_Proxy_Request trait to the connection package
diff --git a/projects/plugins/jetpack/changelog/update-newsletter-category-settings b/projects/plugins/jetpack/changelog/update-newsletter-category-settings
deleted file mode 100644
index d57cd003e9801..0000000000000
--- a/projects/plugins/jetpack/changelog/update-newsletter-category-settings
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: other
-
-Update newsletter category settings to clarify that you need to choose one or more categories to allow people to subscribe to.
diff --git a/projects/plugins/jetpack/changelog/update-sentence-case-pexels b/projects/plugins/jetpack/changelog/update-sentence-case-pexels
new file mode 100644
index 0000000000000..36373b89b3090
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-sentence-case-pexels
@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+Update title of "Pexels Free Photos" to be sentence case to match adjacent options.
diff --git a/projects/plugins/jetpack/changelog/update-social-logo-usage b/projects/plugins/jetpack/changelog/update-social-logo-usage
deleted file mode 100644
index 097b542ee724f..0000000000000
--- a/projects/plugins/jetpack/changelog/update-social-logo-usage
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-Updated social-logos import from default to named
diff --git a/projects/plugins/jetpack/changelog/update-social-sig-description-block-editor b/projects/plugins/jetpack/changelog/update-social-sig-description-block-editor
new file mode 100644
index 0000000000000..621802e1c2a7a
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-social-sig-description-block-editor
@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+SIG: Changed description for togle
diff --git a/projects/plugins/jetpack/changelog/update-stats-lazy-loading-adminbar-image b/projects/plugins/jetpack/changelog/update-stats-lazy-loading-adminbar-image
deleted file mode 100644
index cc3aacb2a56ba..0000000000000
--- a/projects/plugins/jetpack/changelog/update-stats-lazy-loading-adminbar-image
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: other
-
-Load the adminbar stats graph lazily"
diff --git a/projects/plugins/jetpack/changelog/update-stats_remove_legacy_widget_loader b/projects/plugins/jetpack/changelog/update-stats_remove_legacy_widget_loader
deleted file mode 100644
index 23a50a2206b08..0000000000000
--- a/projects/plugins/jetpack/changelog/update-stats_remove_legacy_widget_loader
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: other
-
-Remove legacy Stats widget loader
diff --git a/projects/plugins/jetpack/composer.json b/projects/plugins/jetpack/composer.json
index bd613184927c5..0d56f82d14f60 100644
--- a/projects/plugins/jetpack/composer.json
+++ b/projects/plugins/jetpack/composer.json
@@ -106,7 +106,7 @@
"platform": {
"ext-intl": "0.0.0"
},
- "autoloader-suffix": "f11009ded9fc4592b6a05b61ce272b3c_jetpackⓥ14_2",
+ "autoloader-suffix": "f11009ded9fc4592b6a05b61ce272b3c_jetpackⓥ14_3_a_1",
"allow-plugins": {
"automattic/jetpack-autoloader": true,
"automattic/jetpack-composer-plugin": true
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
index f823169790931..6a28de5b4b900 100644
--- a/projects/plugins/jetpack/composer.lock
+++ b/projects/plugins/jetpack/composer.lock
@@ -704,7 +704,7 @@
"dist": {
"type": "path",
"url": "../../packages/classic-theme-helper",
- "reference": "198fd841c5341850e247c46168d77b1bc6a13a34"
+ "reference": "97a68997e5f3dc805df942c53586bab3f2137427"
},
"require": {
"automattic/jetpack-assets": "@dev",
@@ -722,7 +722,7 @@
"extra": {
"autotagger": true,
"branch-alias": {
- "dev-trunk": "0.8.x-dev"
+ "dev-trunk": "0.9.x-dev"
},
"changelogger": {
"link-template": "https://github.com/Automattic/jetpack-classic-theme-helper/compare/v${old}...v${new}"
@@ -1741,7 +1741,7 @@
"dist": {
"type": "path",
"url": "../../packages/masterbar",
- "reference": "f4317f289a90af787f81e695268be1ef00cd0255"
+ "reference": "f26d6309fe2d4ef4298d616f25f4e4d815c388bd"
},
"require": {
"automattic/jetpack-assets": "@dev",
@@ -1814,6 +1814,10 @@
"test-php": [
"pnpm run build-production",
"@composer phpunit"
+ ],
+ "watch": [
+ "Composer\\Config::disableProcessTimeout",
+ "pnpm run watch"
]
},
"license": [
@@ -2812,7 +2816,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "ece2cb5be16c8bc399fb6681a61ffa42b42e3cf5"
+ "reference": "9f24b0cb0912e1e3f235e946b9f397ffd9e36ccf"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -2845,7 +2849,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "4.2.x-dev"
+ "dev-trunk": "4.3.x-dev"
},
"dependencies": {
"test-only": [
@@ -3320,16 +3324,16 @@
"packages-dev": [
{
"name": "antecedent/patchwork",
- "version": "2.2.0",
+ "version": "2.2.1",
"source": {
"type": "git",
"url": "https://github.com/antecedent/patchwork.git",
- "reference": "b07d4fb37c3c723c8755122160c089e077d5de65"
+ "reference": "1bf183a3e1bd094f231a2128b9ecc5363c269245"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/antecedent/patchwork/zipball/b07d4fb37c3c723c8755122160c089e077d5de65",
- "reference": "b07d4fb37c3c723c8755122160c089e077d5de65",
+ "url": "https://api.github.com/repos/antecedent/patchwork/zipball/1bf183a3e1bd094f231a2128b9ecc5363c269245",
+ "reference": "1bf183a3e1bd094f231a2128b9ecc5363c269245",
"shasum": ""
},
"require": {
@@ -3362,9 +3366,9 @@
],
"support": {
"issues": "https://github.com/antecedent/patchwork/issues",
- "source": "https://github.com/antecedent/patchwork/tree/2.2.0"
+ "source": "https://github.com/antecedent/patchwork/tree/2.2.1"
},
- "time": "2024-09-27T16:59:55+00:00"
+ "time": "2024-12-11T10:19:54+00:00"
},
{
"name": "automattic/jetpack-changelogger",
@@ -3686,16 +3690,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.1",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
"shasum": ""
},
"require": {
@@ -3738,9 +3742,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
},
- "time": "2024-10-08T18:51:32+00:00"
+ "time": "2024-12-30T11:07:19+00:00"
},
{
"name": "phar-io/manifest",
@@ -5300,16 +5304,16 @@
},
{
"name": "symfony/console",
- "version": "v7.2.0",
+ "version": "v7.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf"
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
+ "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
"shasum": ""
},
"require": {
@@ -5373,7 +5377,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.2.0"
+ "source": "https://github.com/symfony/console/tree/v7.2.1"
},
"funding": [
{
@@ -5389,7 +5393,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-06T14:24:19+00:00"
+ "time": "2024-12-11T03:49:26+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -5410,12 +5414,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -5722,8 +5726,8 @@
"type": "library",
"extra": {
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -5861,12 +5865,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -6059,16 +6063,16 @@
},
{
"name": "yoast/phpunit-polyfills",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be"
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
+ "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
"shasum": ""
},
"require": {
@@ -6118,7 +6122,7 @@
"security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
"source": "https://github.com/Yoast/PHPUnit-Polyfills"
},
- "time": "2024-09-06T22:03:10+00:00"
+ "time": "2025-01-08T16:58:34+00:00"
}
],
"aliases": [],
diff --git a/projects/plugins/jetpack/extensions/blocks/sharing-buttons/view.js b/projects/plugins/jetpack/extensions/blocks/sharing-buttons/view.js
index 524eb9668c995..90169f1f19989 100644
--- a/projects/plugins/jetpack/extensions/blocks/sharing-buttons/view.js
+++ b/projects/plugins/jetpack/extensions/blocks/sharing-buttons/view.js
@@ -39,7 +39,7 @@ if ( typeof window !== 'undefined' ) {
if ( link?.href && isWebShareAPIEnabled( { url: link.href } ) ) {
navigator.share( { url: link.href } );
} else {
- const [ tooltip ] = document.getElementsByClassName( 'tooltiptext' );
+ const [ tooltip ] = link.getElementsByClassName( 'tooltiptext' );
if ( tooltip && tooltip.style ) {
tooltip.style.display = 'initial';
setTimeout( () => {
diff --git a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/gallery-image/edit.js b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/gallery-image/edit.js
index a409b2799e439..84ed896b32f2f 100644
--- a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/gallery-image/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/gallery-image/edit.js
@@ -17,13 +17,12 @@ class GalleryImageEdit extends Component {
};
onImageKeyDown = event => {
- if (
- this.img.current &&
- this.img.current === this.img.current.ownerDocument.activeElement &&
- this.props.isSelected &&
- [ BACKSPACE, DELETE ].includes( event.keyCode )
- ) {
- this.props.onRemove();
+ const { isSelected, onRemove } = this.props;
+
+ // Check for BACKSPACE or DELETE key presses
+ if ( isSelected && [ BACKSPACE, DELETE ].includes( event.keyCode ) ) {
+ event.preventDefault();
+ onRemove();
}
};
@@ -92,39 +91,36 @@ class GalleryImageEdit extends Component {
const isTransient = isBlobURL( origUrl );
const img = (
- // Disable reason: Image itself is not meant to be interactive, but should
- // direct image selection and unfocus caption fields.
- /* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
{ isTransient && }
- /* eslint-enable jsx-a11y/no-noninteractive-element-interactions */
);
- // Disable reason: Each block can be selected by clicking on it and we should keep the same saved markup
return (
-
{ showMovers && (
@@ -156,8 +152,8 @@ class GalleryImageEdit extends Component {
/>
{ /* Keep the HTML structure, but ensure there is no navigation from edit */ }
- { href ? { img } : img }
-
+ { href ? { img } : img }
+
);
}
}
diff --git a/projects/plugins/jetpack/extensions/blocks/videopress/editor.js b/projects/plugins/jetpack/extensions/blocks/videopress/editor.js
index b8edfdb9e401d..5720e158a30b8 100644
--- a/projects/plugins/jetpack/extensions/blocks/videopress/editor.js
+++ b/projects/plugins/jetpack/extensions/blocks/videopress/editor.js
@@ -6,7 +6,6 @@ import {
isAtomicSite,
isSimpleSite,
getJetpackExtensionAvailability,
- withHasWarningIsInteractiveClassNames,
} from '@automattic/jetpack-shared-extension-utils';
import { createBlobURL } from '@wordpress/blob';
import { useBlockEditContext, store as blockEditorStore } from '@wordpress/block-editor';
@@ -186,11 +185,6 @@ const addVideoPressSupport = ( settings, name ) => {
// Check if VideoPress is unavailable and filter the mediaplaceholder to limit options
if ( isNotAvailable ) {
addFilter( 'editor.MediaPlaceholder', 'jetpack/videopress', videoPressNoPlanMediaPlaceholder );
- addFilter(
- 'editor.BlockListBlock',
- `jetpack/videopress-with-has-warning-is-interactive-class-names`,
- withHasWarningIsInteractiveClassNames( `core/video` )
- );
} else if ( available ) {
if ( resumableUploadEnabled ) {
addFilter( 'editor.MediaPlaceholder', 'jetpack/videopress', videoPressMediaPlaceholder );
diff --git a/projects/plugins/jetpack/extensions/extended-blocks/paid-blocks/with-upgrade-banner.jsx b/projects/plugins/jetpack/extensions/extended-blocks/paid-blocks/with-upgrade-banner.jsx
index f1b09dfe29db9..6695913b7b9f0 100644
--- a/projects/plugins/jetpack/extensions/extended-blocks/paid-blocks/with-upgrade-banner.jsx
+++ b/projects/plugins/jetpack/extensions/extended-blocks/paid-blocks/with-upgrade-banner.jsx
@@ -8,6 +8,7 @@ import { useBlockProps } from '@wordpress/block-editor';
import { createHigherOrderComponent } from '@wordpress/compose';
import { useSelect } from '@wordpress/data';
import { useState, useEffect, useMemo, useContext } from '@wordpress/element';
+import clsx from 'clsx';
import { PaidBlockContext, PaidBlockProvider } from './components';
import UpgradePlanBanner from './upgrade-plan-banner';
import { trackUpgradeBannerImpression, trackUpgradeClickEvent } from './utils';
@@ -80,14 +81,14 @@ const withUpgradeBanner = createHigherOrderComponent(
const blockProps = useBlockProps();
// Fix for width of cover block because otherwise the div defaults to content-size as max width
- const cssFixForCoverBlock = { 'max-width': 'unset' };
+ const cssFixForCoverBlock = { maxwidth: 'unset' };
return (
-
+
trackUpgradeClickEvent( trackEventData ) }
/>
-
+
);
diff --git a/projects/plugins/jetpack/extensions/shared/external-media/media-service/index.ts b/projects/plugins/jetpack/extensions/shared/external-media/media-service/index.ts
index 8f7bbc9261397..f938fd65e0fe4 100644
--- a/projects/plugins/jetpack/extensions/shared/external-media/media-service/index.ts
+++ b/projects/plugins/jetpack/extensions/shared/external-media/media-service/index.ts
@@ -11,8 +11,8 @@ import { MediaSource } from './types';
// Pexels constants
const PEXELS_ID = 'pexels';
-const PEXELS_NAME = __( 'Pexels Free Photos', 'jetpack' );
-const PEXELS_SEARCH_PLACEHOLDER = __( 'Search Pexels Free Photos', 'jetpack' );
+const PEXELS_NAME = __( 'Pexels free photos', 'jetpack' );
+const PEXELS_SEARCH_PLACEHOLDER = __( 'Search Pexels free photos', 'jetpack' );
const DEFAULT_PEXELS_SEARCH: MediaSearch = {
per_page: 10,
search: 'mountain',
diff --git a/projects/plugins/jetpack/extensions/shared/external-media/sources/index.js b/projects/plugins/jetpack/extensions/shared/external-media/sources/index.js
index f150a47ed609c..6c4014efe30f3 100644
--- a/projects/plugins/jetpack/extensions/shared/external-media/sources/index.js
+++ b/projects/plugins/jetpack/extensions/shared/external-media/sources/index.js
@@ -61,7 +61,7 @@ export const externalMediaSources = [
},
{
id: SOURCE_PEXELS,
- label: __( 'Pexels Free Photos', 'jetpack' ),
+ label: __( 'Pexels free photos', 'jetpack' ),
icon: ,
keyword: 'pexels',
},
diff --git a/projects/plugins/jetpack/extensions/shared/icons.js b/projects/plugins/jetpack/extensions/shared/icons.js
index d5e4fe35ae27f..c0b40c80481f2 100644
--- a/projects/plugins/jetpack/extensions/shared/icons.js
+++ b/projects/plugins/jetpack/extensions/shared/icons.js
@@ -305,10 +305,9 @@ export const DescriptIcon = {
src: (
),
diff --git a/projects/plugins/jetpack/extensions/shared/register-jetpack-block.js b/projects/plugins/jetpack/extensions/shared/register-jetpack-block.js
index 8aa786381d558..850dc5edb39b5 100644
--- a/projects/plugins/jetpack/extensions/shared/register-jetpack-block.js
+++ b/projects/plugins/jetpack/extensions/shared/register-jetpack-block.js
@@ -1,11 +1,9 @@
import {
getJetpackExtensionAvailability,
- withHasWarningIsInteractiveClassNames,
requiresPaidPlan,
getBlockIconProp,
} from '@automattic/jetpack-shared-extension-utils';
import { registerBlockType } from '@wordpress/blocks';
-import { addFilter } from '@wordpress/hooks';
const JETPACK_PREFIX = 'jetpack/';
@@ -52,14 +50,6 @@ export default function registerJetpackBlock(
settings
);
- if ( requiredPlan ) {
- addFilter(
- 'editor.BlockListBlock',
- `${ prefixedName }-with-has-warning-is-interactive-class-names`,
- withHasWarningIsInteractiveClassNames( prefixedName )
- );
- }
-
// Register child blocks. Using `registerBlockType()` directly avoids availability checks -- if
// their parent is available, we register them all, without checking for their individual availability.
childBlocks.forEach( childBlock =>
diff --git a/projects/plugins/jetpack/jetpack.php b/projects/plugins/jetpack/jetpack.php
index ceca5abe0be20..b7b4b4d9580d5 100644
--- a/projects/plugins/jetpack/jetpack.php
+++ b/projects/plugins/jetpack/jetpack.php
@@ -4,7 +4,7 @@
* Plugin URI: https://jetpack.com
* Description: Security, performance, and marketing tools made by WordPress experts. Jetpack keeps your site protected so you can focus on more important things.
* Author: Automattic
- * Version: 14.2
+ * Version: 14.3-a.1
* Author URI: https://jetpack.com
* License: GPL2+
* Text Domain: jetpack
@@ -34,7 +34,7 @@
define( 'JETPACK__MINIMUM_WP_VERSION', '6.6' );
define( 'JETPACK__MINIMUM_PHP_VERSION', '7.2' );
-define( 'JETPACK__VERSION', '14.2' );
+define( 'JETPACK__VERSION', '14.3-a.1' );
/**
* Constant used to fetch the connection owner token
diff --git a/projects/plugins/jetpack/modules/copy-post.php b/projects/plugins/jetpack/modules/copy-post.php
index 762fbcba41bd2..85512f024a347 100644
--- a/projects/plugins/jetpack/modules/copy-post.php
+++ b/projects/plugins/jetpack/modules/copy-post.php
@@ -29,7 +29,7 @@ class Jetpack_Copy_Post {
* @return void
*/
public function __construct() {
- if ( 'edit.php' === $GLOBALS['pagenow'] ) {
+ if ( 'edit.php' === $GLOBALS['pagenow'] || ( 'admin-ajax.php' === $GLOBALS['pagenow'] && ! empty( $_POST['screen'] ) && 'edit-post' === $_POST['screen'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing -- update_post_data() handles access check.
add_action( 'admin_head', array( $this, 'print_inline_styles' ) );
add_filter( 'post_row_actions', array( $this, 'add_row_action' ), 10, 2 );
add_filter( 'page_row_actions', array( $this, 'add_row_action' ), 10, 2 );
diff --git a/projects/plugins/jetpack/modules/custom-post-types/nova.php b/projects/plugins/jetpack/modules/custom-post-types/nova.php
index b01bc0287b0bb..9373ef4d0c63a 100644
--- a/projects/plugins/jetpack/modules/custom-post-types/nova.php
+++ b/projects/plugins/jetpack/modules/custom-post-types/nova.php
@@ -25,9 +25,6 @@
* @package automattic/jetpack
*/
-use Automattic\Jetpack\Assets;
-use Automattic\Jetpack\Roles;
-
if ( ! class_exists( '\Nova_Restaurant' ) ) {
/**
@@ -38,9 +35,18 @@ class Nova_Restaurant {
const MENU_ITEM_LABEL_TAX = 'nova_menu_item_label';
const MENU_TAX = 'nova_menu';
+ /**
+ * Store an instance of the new class
+ *
+ * @var Automattic\Jetpack\Classic_Theme_Helper\Nova_Restaurant
+ */
+ protected $new_instance;
+
/**
* Version number used when enqueuing all resources (css and js).
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @var string
*/
public $version = '20210303';
@@ -48,6 +54,8 @@ class Nova_Restaurant {
/**
* Default markup for the menu items.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @var array
*/
protected $default_menu_item_loop_markup = array(
@@ -64,6 +72,8 @@ class Nova_Restaurant {
/**
* Array of markup for the menu items.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @var array
*/
protected $menu_item_loop_markup = array();
@@ -71,6 +81,8 @@ class Nova_Restaurant {
/**
* Last term ID of a loop of menu items.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @var bool|int
*/
protected $menu_item_loop_last_term_id = false;
@@ -78,6 +90,8 @@ class Nova_Restaurant {
/**
* Current term ID of a loop of menu items.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @var bool|int
*/
protected $menu_item_loop_current_term = false;
@@ -85,22 +99,15 @@ class Nova_Restaurant {
/**
* Initialize class.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param array $menu_item_loop_markup Array of markup for the menu items.
*
- * @return self
+ * @return Automattic\Jetpack\Classic_Theme_Helper\Nova_Restaurant
*/
public static function init( $menu_item_loop_markup = array() ) {
- static $instance = false;
-
- if ( ! $instance ) {
- $instance = new Nova_Restaurant();
- }
-
- if ( $menu_item_loop_markup ) {
- $instance->menu_item_loop_markup = wp_parse_args( $menu_item_loop_markup, $instance->default_menu_item_loop_markup );
- }
-
- return $instance;
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ return Automattic\Jetpack\Classic_Theme_Helper\Nova_Restaurant::init( $menu_item_loop_markup );
}
/**
@@ -108,519 +115,208 @@ public static function init( $menu_item_loop_markup = array() ) {
* Hook into WordPress to create CPT and utilities if needed.
*/
public function __construct() {
- if ( ! $this->site_supports_nova() ) {
- return;
- }
-
- $this->register_taxonomies();
- $this->register_post_types();
- add_action( 'admin_menu', array( $this, 'add_admin_menus' ) );
- add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_nova_styles' ) );
- add_action( 'admin_head', array( $this, 'set_custom_font_icon' ) );
-
- // Always sort menu items correctly
- add_action( 'parse_query', array( $this, 'sort_menu_item_queries_by_menu_order' ) );
- add_filter( 'posts_results', array( $this, 'sort_menu_item_queries_by_menu_taxonomy' ), 10, 2 );
-
- add_action( 'wp_insert_post', array( $this, 'add_post_meta' ) );
-
- $this->menu_item_loop_markup = $this->default_menu_item_loop_markup;
+ $this->new_instance = new Automattic\Jetpack\Classic_Theme_Helper\Nova_Restaurant();
+ }
- // Only output our Menu Item Loop Markup on a real blog view. Not feeds, XML-RPC, admin, etc.
- add_filter( 'template_include', array( $this, 'setup_menu_item_loop_markup__in_filter' ) );
+ /**
+ * Forward all method calls to the Nova_Restaurant class.
+ *
+ * @param string $name The name of the method.
+ * @param array $arguments The arguments to pass to the method.
+ *
+ * @throws Exception If the method is not found.
+ */
+ public function __call( $name, $arguments ) {
+ if ( method_exists( $this->new_instance, $name ) ) {
+ return call_user_func_array( array( $this->new_instance, $name ), $arguments );
+ } else {
+ // Handle cases where the method is not found
+ throw new Exception( sprintf( 'Undefined method: %s', esc_html( $name ) ) );
+ }
+ }
- add_filter( 'enter_title_here', array( $this, 'change_default_title' ) );
- add_filter( 'post_updated_messages', array( $this, 'updated_messages' ) );
- add_filter( 'dashboard_glance_items', array( $this, 'add_to_dashboard' ) );
+ /**
+ * Forward all static method calls to the Nova_Restaurant class.
+ *
+ * @param string $name The name of the method.
+ * @param array $arguments The arguments to pass to the method.
+ *
+ * @throws Exception If the method is not found.
+ */
+ public static function __callStatic( $name, $arguments ) {
+ if ( method_exists( Automattic\Jetpack\Classic_Theme_Helper\Nova_Restaurant::class, $name ) ) {
+ return call_user_func_array( array( Automattic\Jetpack\Classic_Theme_Helper\Nova_Restaurant::class, $name ), $arguments );
+ } else {
+ // Handle cases where the method is not found
+ throw new Exception( sprintf( 'Undefined static method: %s', esc_html( $name ) ) );
+ }
}
/**
* Should this Custom Post Type be made available?
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @return bool
*/
public function site_supports_nova() {
- // If we're on WordPress.com, and it has the menu site vertical.
- if ( function_exists( 'site_vertical' ) && 'nova_menu' === site_vertical() ) {
- return true;
- }
-
- // Else, if the current theme requests it.
- if ( current_theme_supports( self::MENU_ITEM_POST_TYPE ) ) {
- return true;
- }
-
- // Otherwise, say no unless something wants to filter us to say yes.
- /**
- * Allow something else to hook in and enable this CPT.
- *
- * @module custom-content-types
- *
- * @since 2.6.0
- *
- * @param bool false Whether or not to enable this CPT.
- * @param string $var The slug for this CPT.
- */
- return (bool) apply_filters( 'jetpack_enable_cpt', false, self::MENU_ITEM_POST_TYPE );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ return $this->new_instance->site_supports_nova();
}
/* Setup */
/**
* Register Taxonomies and Post Type
+ *
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
*/
public function register_taxonomies() {
- if ( ! taxonomy_exists( self::MENU_ITEM_LABEL_TAX ) ) {
- register_taxonomy(
- self::MENU_ITEM_LABEL_TAX,
- self::MENU_ITEM_POST_TYPE,
- array(
- 'labels' => array(
- /* translators: this is about a food menu */
- 'name' => __( 'Menu Item Labels', 'jetpack' ),
- /* translators: this is about a food menu */
- 'singular_name' => __( 'Menu Item Label', 'jetpack' ),
- /* translators: this is about a food menu */
- 'search_items' => __( 'Search Menu Item Labels', 'jetpack' ),
- 'popular_items' => __( 'Popular Labels', 'jetpack' ),
- /* translators: this is about a food menu */
- 'all_items' => __( 'All Menu Item Labels', 'jetpack' ),
- /* translators: this is about a food menu */
- 'edit_item' => __( 'Edit Menu Item Label', 'jetpack' ),
- /* translators: this is about a food menu */
- 'view_item' => __( 'View Menu Item Label', 'jetpack' ),
- /* translators: this is about a food menu */
- 'update_item' => __( 'Update Menu Item Label', 'jetpack' ),
- /* translators: this is about a food menu */
- 'add_new_item' => __( 'Add New Menu Item Label', 'jetpack' ),
- /* translators: this is about a food menu */
- 'new_item_name' => __( 'New Menu Item Label Name', 'jetpack' ),
- 'separate_items_with_commas' => __( 'For example, spicy, favorite, etc. Separate Labels with commas', 'jetpack' ),
- 'add_or_remove_items' => __( 'Add or remove Labels', 'jetpack' ),
- 'choose_from_most_used' => __( 'Choose from the most used Labels', 'jetpack' ),
- 'items_list_navigation' => __( 'Menu item label list navigation', 'jetpack' ),
- 'items_list' => __( 'Menu item labels list', 'jetpack' ),
- ),
- 'no_tagcloud' => __( 'No Labels found', 'jetpack' ),
- 'hierarchical' => false,
- )
- );
- }
-
- if ( ! taxonomy_exists( self::MENU_TAX ) ) {
- register_taxonomy(
- self::MENU_TAX,
- self::MENU_ITEM_POST_TYPE,
- array(
- 'labels' => array(
- /* translators: this is about a food menu */
- 'name' => __( 'Menu Sections', 'jetpack' ),
- /* translators: this is about a food menu */
- 'singular_name' => __( 'Menu Section', 'jetpack' ),
- /* translators: this is about a food menu */
- 'search_items' => __( 'Search Menu Sections', 'jetpack' ),
- /* translators: this is about a food menu */
- 'all_items' => __( 'All Menu Sections', 'jetpack' ),
- /* translators: this is about a food menu */
- 'parent_item' => __( 'Parent Menu Section', 'jetpack' ),
- /* translators: this is about a food menu */
- 'parent_item_colon' => __( 'Parent Menu Section:', 'jetpack' ),
- /* translators: this is about a food menu */
- 'edit_item' => __( 'Edit Menu Section', 'jetpack' ),
- /* translators: this is about a food menu */
- 'view_item' => __( 'View Menu Section', 'jetpack' ),
- /* translators: this is about a food menu */
- 'update_item' => __( 'Update Menu Section', 'jetpack' ),
- /* translators: this is about a food menu */
- 'add_new_item' => __( 'Add New Menu Section', 'jetpack' ),
- /* translators: this is about a food menu */
- 'new_item_name' => __( 'New Menu Sections Name', 'jetpack' ),
- 'items_list_navigation' => __( 'Menu section list navigation', 'jetpack' ),
- 'items_list' => __( 'Menu section list', 'jetpack' ),
- ),
- 'rewrite' => array(
- 'slug' => 'menu',
- 'with_front' => false,
- 'hierarchical' => true,
- ),
- 'hierarchical' => true,
- 'show_tagcloud' => false,
- 'query_var' => 'menu',
- )
- );
- }
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->register_taxonomies();
}
/**
* Register our Post Type.
+ *
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
*/
public function register_post_types() {
- if ( post_type_exists( self::MENU_ITEM_POST_TYPE ) ) {
- return;
- }
-
- register_post_type(
- self::MENU_ITEM_POST_TYPE,
- array(
- 'description' => __( "Items on your restaurant's menu", 'jetpack' ),
-
- 'labels' => array(
- /* translators: this is about a food menu */
- 'name' => __( 'Menu Items', 'jetpack' ),
- /* translators: this is about a food menu */
- 'singular_name' => __( 'Menu Item', 'jetpack' ),
- /* translators: this is about a food menu */
- 'menu_name' => __( 'Food Menus', 'jetpack' ),
- /* translators: this is about a food menu */
- 'all_items' => __( 'Menu Items', 'jetpack' ),
- /* translators: this is about a food menu */
- 'add_new' => __( 'Add One Item', 'jetpack' ),
- /* translators: this is about a food menu */
- 'add_new_item' => __( 'Add Menu Item', 'jetpack' ),
- /* translators: this is about a food menu */
- 'edit_item' => __( 'Edit Menu Item', 'jetpack' ),
- /* translators: this is about a food menu */
- 'new_item' => __( 'New Menu Item', 'jetpack' ),
- /* translators: this is about a food menu */
- 'view_item' => __( 'View Menu Item', 'jetpack' ),
- /* translators: this is about a food menu */
- 'search_items' => __( 'Search Menu Items', 'jetpack' ),
- /* translators: this is about a food menu */
- 'not_found' => __( 'No Menu Items found', 'jetpack' ),
- /* translators: this is about a food menu */
- 'not_found_in_trash' => __( 'No Menu Items found in Trash', 'jetpack' ),
- 'filter_items_list' => __( 'Filter menu items list', 'jetpack' ),
- 'items_list_navigation' => __( 'Menu item list navigation', 'jetpack' ),
- 'items_list' => __( 'Menu items list', 'jetpack' ),
- ),
- 'supports' => array(
- 'title',
- 'editor',
- 'thumbnail',
- 'excerpt',
- ),
- 'rewrite' => array(
- 'slug' => 'item',
- 'with_front' => false,
- 'feeds' => false,
- 'pages' => false,
- ),
- 'register_meta_box_cb' => array( $this, 'register_menu_item_meta_boxes' ),
-
- 'public' => true,
- 'show_ui' => true, // set to false to replace with custom UI
- 'menu_position' => 20, // below Pages
- 'capability_type' => 'page',
- 'map_meta_cap' => true,
- 'has_archive' => false,
- 'query_var' => 'item',
- )
- );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->register_post_types();
}
/**
* Update messages for the Menu Item admin.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param array $messages Existing post update messages.
*
* @return array $messages Updated post update messages.
*/
public function updated_messages( $messages ) {
- global $post;
-
- $messages[ self::MENU_ITEM_POST_TYPE ] = array(
- 0 => '', // Unused. Messages start at index 1.
- 1 => sprintf(
- /* translators: this is about a food menu. Placeholder is a link to the food menu. */
- __( 'Menu item updated. View item', 'jetpack' ),
- esc_url( get_permalink( $post->ID ) )
- ),
- 2 => esc_html__( 'Custom field updated.', 'jetpack' ),
- 3 => esc_html__( 'Custom field deleted.', 'jetpack' ),
- /* translators: this is about a food menu */
- 4 => esc_html__( 'Menu item updated.', 'jetpack' ),
- 5 => isset( $_GET['revision'] ) // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Copying core message handling.
- ? sprintf(
- /* translators: %s: date and time of the revision */
- esc_html__( 'Menu item restored to revision from %s', 'jetpack' ),
- wp_post_revision_title( (int) $_GET['revision'], false ) // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- Copying core message handling.
- )
- : false,
- 6 => sprintf(
- /* translators: this is about a food menu. Placeholder is a link to the food menu. */
- __( 'Menu item published. View item', 'jetpack' ),
- esc_url( get_permalink( $post->ID ) )
- ),
- /* translators: this is about a food menu */
- 7 => esc_html__( 'Menu item saved.', 'jetpack' ),
- 8 => sprintf(
- /* translators: this is about a food menu */
- __( 'Menu item submitted. Preview item', 'jetpack' ),
- esc_url( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) )
- ),
- 9 => sprintf(
- /* translators: this is about a food menu. 1. Publish box date format, see https://php.net/date 2. link to the food menu. */
- __( 'Menu item scheduled for: %1$s. Preview item', 'jetpack' ),
- /* translators: Publish box date format, see https://php.net/date */
- date_i18n( __( 'M j, Y @ G:i', 'jetpack' ), strtotime( $post->post_date ) ),
- esc_url( get_permalink( $post->ID ) )
- ),
- 10 => sprintf(
- /* translators: this is about a food menu. Placeholder is a link to the food menu. */
- __( 'Menu item draft updated. Preview item', 'jetpack' ),
- esc_url( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) )
- ),
- );
-
- return $messages;
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ return $this->new_instance->updated_messages( $messages );
}
/**
* Nova styles and scripts.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param string $hook Page hook.
*
* @return void
*/
public function enqueue_nova_styles( $hook ) {
- global $post_type;
- $pages = array( 'edit.php', 'post.php', 'post-new.php' );
-
- if ( in_array( $hook, $pages, true ) && $post_type === self::MENU_ITEM_POST_TYPE ) {
- wp_enqueue_style( 'nova-style', plugins_url( 'css/nova.css', __FILE__ ), array(), $this->version );
- }
-
- wp_enqueue_style( 'nova-font', plugins_url( 'css/nova-font.css', __FILE__ ), array(), $this->version );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->enqueue_nova_styles( $hook );
}
/**
* Change ‘Enter Title Here’ text for the Menu Item.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param string $title Default title placeholder text.
*
* @return string
*/
public function change_default_title( $title ) {
- if ( self::MENU_ITEM_POST_TYPE === get_post_type() ) {
- /* translators: this is about a food menu */
- $title = esc_html__( "Enter the menu item's name here", 'jetpack' );
- }
-
- return $title;
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ return $this->new_instance->change_default_title( $title );
}
/**
* Add to Dashboard At A Glance
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @return void
*/
public function add_to_dashboard() {
- $number_menu_items = wp_count_posts( self::MENU_ITEM_POST_TYPE );
-
- $roles = new Roles();
- if ( current_user_can( $roles->translate_role_to_cap( 'administrator' ) ) ) {
- $number_menu_items_published = sprintf(
- ' %2$s',
- esc_url(
- get_admin_url(
- get_current_blog_id(),
- 'edit.php?post_type=' . self::MENU_ITEM_POST_TYPE
- )
- ),
- sprintf(
- /* translators: Placehoder is a number of items. */
- _n(
- '%1$d Food Menu Item',
- '%1$d Food Menu Items',
- (int) $number_menu_items->publish,
- 'jetpack'
- ),
- number_format_i18n( $number_menu_items->publish )
- )
- );
- } else {
- $number_menu_items_published = sprintf(
- ' %1$s',
- sprintf(
- /* translators: Placehoder is a number of items. */
- _n(
- '%1$d Food Menu Item',
- '%1$d Food Menu Items',
- (int) $number_menu_items->publish,
- 'jetpack'
- ),
- number_format_i18n( $number_menu_items->publish )
- )
- );
- }
-
- echo ''; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- we escape things above.
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->add_to_dashboard();
}
/**
* If the WP query for our menu items.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param WP_Query $query WP Query.
*
* @return bool
*/
public function is_menu_item_query( $query ) {
- if (
- ( isset( $query->query_vars['taxonomy'] ) && self::MENU_TAX === $query->query_vars['taxonomy'] )
- ||
- ( isset( $query->query_vars['post_type'] ) && self::MENU_ITEM_POST_TYPE === $query->query_vars['post_type'] )
- ) {
- return true;
- }
-
- return false;
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ return $this->new_instance->is_menu_item_query( $query );
}
/**
* Custom sort the menu item queries by menu order.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param WP_Query $query WP Query.
*
* @return void
*/
public function sort_menu_item_queries_by_menu_order( $query ) {
- if ( ! $this->is_menu_item_query( $query ) ) {
- return;
- }
-
- $query->query_vars['orderby'] = 'menu_order';
- $query->query_vars['order'] = 'ASC';
-
- // For now, just turn off paging so we can sort by taxonmy later
- // If we want paging in the future, we'll need to add the taxonomy sort here (or at least before the DB query is made)
- $query->query_vars['posts_per_page'] = -1;
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->sort_menu_item_queries_by_menu_order( $query );
}
/**
* Custom sort the menu item queries by menu taxonomies.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param WP_Post[] $posts Array of post objects.
* @param WP_Query $query The WP_Query instance.
*
* @return WP_Post[]
*/
public function sort_menu_item_queries_by_menu_taxonomy( $posts, $query ) {
- if ( ! $posts ) {
- return $posts;
- }
-
- if ( ! $this->is_menu_item_query( $query ) ) {
- return $posts;
- }
-
- $grouped_by_term = array();
-
- foreach ( $posts as $post ) {
- $term = $this->get_menu_item_menu_leaf( $post->ID );
- if ( ! $term || is_wp_error( $term ) ) {
- $term_id = 0;
- } else {
- $term_id = $term->term_id;
- }
-
- if ( ! isset( $grouped_by_term[ "$term_id" ] ) ) {
- $grouped_by_term[ "$term_id" ] = array();
- }
-
- $grouped_by_term[ "$term_id" ][] = $post;
- }
-
- $term_order = get_option( 'nova_menu_order', array() );
-
- $return = array();
- foreach ( $term_order as $term_id ) {
- if ( isset( $grouped_by_term[ "$term_id" ] ) ) {
- $return = array_merge( $return, $grouped_by_term[ "$term_id" ] );
- unset( $grouped_by_term[ "$term_id" ] );
- }
- }
-
- foreach ( $grouped_by_term as $term_id => $posts ) {
- $return = array_merge( $return, $posts );
- }
-
- return $return;
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ return $this->new_instance->sort_menu_item_queries_by_menu_taxonomy( $posts, $query );
}
/**
* Add new "Add many items" submenu, custom colunmns, and custom bulk actions.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @return void
*/
public function add_admin_menus() {
- $hook = add_submenu_page(
- 'edit.php?post_type=' . self::MENU_ITEM_POST_TYPE,
- __( 'Add Many Items', 'jetpack' ),
- __( 'Add Many Items', 'jetpack' ),
- 'edit_pages',
- 'add_many_nova_items',
- array( $this, 'add_many_new_items_page' )
- );
-
- add_action( "load-$hook", array( $this, 'add_many_new_items_page_load' ) );
-
- add_action( 'current_screen', array( $this, 'current_screen_load' ) );
-
- /*
- * Adjust 'Add Many Items' submenu position
- * We're making changes to the menu global, but no other choice unfortunately.
- * phpcs:disable WordPress.WP.GlobalVariablesOverride.Prohibited
- */
- if ( isset( $GLOBALS['submenu'][ 'edit.php?post_type=' . self::MENU_ITEM_POST_TYPE ] ) ) {
- $submenu_item = array_pop( $GLOBALS['submenu'][ 'edit.php?post_type=' . self::MENU_ITEM_POST_TYPE ] );
- $GLOBALS['submenu'][ 'edit.php?post_type=' . self::MENU_ITEM_POST_TYPE ][11] = $submenu_item;
- ksort( $GLOBALS['submenu'][ 'edit.php?post_type=' . self::MENU_ITEM_POST_TYPE ] );
- }
- // phpcs:enable WordPress.WP.GlobalVariablesOverride.Prohibited
-
- $this->setup_menu_item_columns();
-
- wp_register_script(
- 'nova-menu-checkboxes',
- Assets::get_file_url_for_environment(
- '_inc/build/custom-post-types/js/menu-checkboxes.min.js',
- 'modules/custom-post-types/js/menu-checkboxes.js'
- ),
- array(),
- $this->version,
- true
- );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->add_admin_menus();
}
/**
* Custom Nova Icon CSS
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @return void
*/
public function set_custom_font_icon() {
- ?>
-
- new_instance->set_custom_font_icon();
}
/**
* Load Nova menu management tools on the CPT admin screen.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @return void
*/
public function current_screen_load() {
- $screen = get_current_screen();
- if ( 'edit-nova_menu_item' !== $screen->id ) {
- return;
- }
-
- $this->edit_menu_items_page_load();
- add_filter( 'admin_notices', array( $this, 'admin_notices' ) );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->current_screen_load();
}
/* Edit Items List */
@@ -628,492 +324,131 @@ public function current_screen_load() {
/**
* Display a notice in wp-admin after items have been changed.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @return void
*/
public function admin_notices() {
- if ( isset( $_GET['nova_reordered'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- this is only displaying a message with no dynamic values.
- printf(
- ' ',
- /* translators: this is about a food menu */
- esc_html__( 'Menu Items re-ordered.', 'jetpack' )
- );
- }
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->admin_notices();
}
/**
* Do not allow sorting by title.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param array $columns An array of sortable columns.
*
* @return array $columns.
*/
public function no_title_sorting( $columns ) {
- if ( isset( $columns['title'] ) ) {
- unset( $columns['title'] );
- }
- return $columns;
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ return $this->new_instance->no_title_sorting( $columns );
}
/**
* Set up custom columns for our Nova menu.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @return void
*/
public function setup_menu_item_columns() {
- add_filter( sprintf( 'manage_edit-%s_sortable_columns', self::MENU_ITEM_POST_TYPE ), array( $this, 'no_title_sorting' ) );
- add_filter( sprintf( 'manage_%s_posts_columns', self::MENU_ITEM_POST_TYPE ), array( $this, 'menu_item_columns' ) );
-
- add_action( sprintf( 'manage_%s_posts_custom_column', self::MENU_ITEM_POST_TYPE ), array( $this, 'menu_item_column_callback' ), 10, 2 );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->setup_menu_item_columns();
}
/**
* Add custom columns to the Nova menu item list.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param array $columns An array of columns.
*
* @return array $columns.
*/
public function menu_item_columns( $columns ) {
- unset( $columns['date'], $columns['likes'] );
-
- $columns['thumbnail'] = __( 'Thumbnail', 'jetpack' );
- $columns['labels'] = __( 'Labels', 'jetpack' );
- $columns['price'] = __( 'Price', 'jetpack' );
- $columns['order'] = __( 'Order', 'jetpack' );
-
- return $columns;
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ return $this->new_instance->menu_item_columns( $columns );
}
/**
* Display custom data in each new custom column we created.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param string $column The name of the column to display.
* @param int $post_id The current post ID.
*
* @return void
*/
public function menu_item_column_callback( $column, $post_id ) {
- $screen = get_current_screen();
-
- switch ( $column ) {
- case 'thumbnail':
- echo get_the_post_thumbnail( $post_id, array( 50, 50 ) );
- break;
- case 'labels':
- $this->list_admin_labels( $post_id );
- break;
- case 'price':
- $this->display_price( $post_id );
- break;
- case 'order':
- $url = admin_url( $screen->parent_file );
-
- $up_url = add_query_arg(
- array(
- 'action' => 'move-item-up',
- 'post_id' => (int) $post_id,
- ),
- wp_nonce_url( $url, 'nova_move_item_up_' . $post_id )
- );
-
- $down_url = add_query_arg(
- array(
- 'action' => 'move-item-down',
- 'post_id' => (int) $post_id,
- ),
- wp_nonce_url( $url, 'nova_move_item_down_' . $post_id )
- );
- $menu_item = get_post( $post_id );
- $this->get_menu_by_post_id( $post_id );
- $term_id = $this->get_menu_by_post_id( $post_id );
- if ( $term_id ) {
- $term_id = $term_id->term_id;
- }
- ?>
-
-
-
-
- — up
-
- — down
-
- new_instance->menu_item_column_callback( $column, $post_id );
}
/**
* Get menu item by post ID.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param int $post_id Post ID.
*
* @return bool|WP_Term
*/
public function get_menu_by_post_id( $post_id = null ) {
- if ( ! $post_id ) {
- return false;
- }
-
- $terms = get_the_terms( $post_id, self::MENU_TAX );
-
- if ( ! is_array( $terms ) ) {
- return false;
- }
-
- return array_pop( $terms );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ return $this->new_instance->get_menu_by_post_id( $post_id );
}
/**
* Fires on a menu edit page. We might have drag-n-drop reordered
+ *
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
*/
public function maybe_reorder_menu_items() {
- // make sure we clicked our button.
- if (
- empty( $_REQUEST['menu_reorder_submit'] )
- || __( 'Save New Order', 'jetpack' ) !== $_REQUEST['menu_reorder_submit']
- ) {
- return;
- }
-
- // make sure we have the nonce.
- if (
- empty( $_REQUEST['drag-drop-reorder'] )
- || ! wp_verify_nonce( sanitize_key( $_REQUEST['drag-drop-reorder'] ), 'drag-drop-reorder' )
- ) {
- return;
- }
-
- // make sure we have data to work with.
- if ( empty( $_REQUEST['nova_menu_term'] ) || empty( $_REQUEST['nova_order'] ) ) {
- return;
- }
-
- $term_pairs = array_map( 'absint', $_REQUEST['nova_menu_term'] );
- $order_pairs = array_map( 'absint', $_REQUEST['nova_order'] );
-
- foreach ( $order_pairs as $id => $menu_order ) {
- $id = absint( $id );
- unset( $order_pairs[ $id ] );
- if ( $id < 0 ) {
- continue;
- }
-
- $post = get_post( $id );
- if ( ! $post ) {
- continue;
- }
-
- // save a write if the order hasn't changed
- if ( (int) $menu_order !== $post->menu_order ) {
- $args = array(
- 'ID' => $id,
- 'menu_order' => $menu_order,
- );
- wp_update_post( $args );
- }
-
- // save a write if the term hasn't changed
- if ( (int) $term_pairs[ $id ] !== $this->get_menu_by_post_id( $id )->term_id ) {
- wp_set_object_terms( $id, $term_pairs[ $id ], self::MENU_TAX );
- }
- }
-
- $redirect = add_query_arg(
- array(
- 'post_type' => self::MENU_ITEM_POST_TYPE,
- 'nova_reordered' => '1',
- ),
- admin_url( 'edit.php' )
- );
- wp_safe_redirect( $redirect );
- exit;
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->maybe_reorder_menu_items();
}
/**
* Handle changes to menu items.
* (process actions, update data, enqueue necessary scripts).
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @return void
*/
public function edit_menu_items_page_load() {
- if ( isset( $_GET['action'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended -- we process the form and check nonces in handle_menu_item_actions.
- $this->handle_menu_item_actions();
- }
-
- $this->maybe_reorder_menu_items();
-
- wp_enqueue_script(
- 'nova-drag-drop',
- Assets::get_file_url_for_environment(
- '_inc/build/custom-post-types/js/nova-drag-drop.min.js',
- 'modules/custom-post-types/js/nova-drag-drop.js'
- ),
- array( 'jquery', 'jquery-ui-sortable' ),
- $this->version,
- true
- );
-
- wp_localize_script(
- 'nova-drag-drop',
- '_novaDragDrop',
- array(
- 'nonce' => wp_create_nonce( 'drag-drop-reorder' ),
- 'nonceName' => 'drag-drop-reorder',
- 'reorder' => __( 'Save New Order', 'jetpack' ),
- 'reorderName' => 'menu_reorder_submit',
- )
- );
- add_action( 'the_post', array( $this, 'show_menu_titles_in_menu_item_list' ) );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->edit_menu_items_page_load();
}
/**
* Process actions to move menu items around.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @return void
*/
public function handle_menu_item_actions() {
- if ( isset( $_GET['action'] ) ) {
- $action = (string) wp_unslash( $_GET['action'] ); // phpcs:ignore WordPress.Security.NonceVerification.Recommended,WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- we check for nonces below, and check against specific strings in switch statement.
- } else {
- return;
- }
-
- switch ( $action ) {
- case 'move-item-up':
- case 'move-item-down':
- $reorder = false;
-
- if ( empty( $_GET['post_id'] ) ) {
- break;
- }
-
- $post_id = (int) $_GET['post_id'];
-
- $term = $this->get_menu_item_menu_leaf( $post_id );
-
- // Get all posts in that term.
- $query = new WP_Query(
- array(
- 'taxonomy' => self::MENU_TAX,
- 'term' => $term->slug,
- )
- );
-
- $order = array();
- foreach ( $query->posts as $post ) {
- $order[] = $post->ID;
- }
-
- if ( 'move-item-up' === $action ) {
- check_admin_referer( 'nova_move_item_up_' . $post_id );
-
- $first_post_id = $order[0];
- if ( $post_id === $first_post_id ) {
- break;
- }
-
- foreach ( $order as $menu_order => $order_post_id ) {
- if ( $post_id !== $order_post_id ) {
- continue;
- }
-
- $swap_post_id = $order[ $menu_order - 1 ];
- $order[ $menu_order - 1 ] = $post_id;
- $order[ $menu_order ] = $swap_post_id;
-
- $reorder = true;
- break;
- }
- } else {
- check_admin_referer( 'nova_move_item_down_' . $post_id );
-
- $last_post_id = end( $order );
- if ( $post_id === $last_post_id ) {
- break;
- }
-
- foreach ( $order as $menu_order => $order_post_id ) {
- if ( $post_id !== $order_post_id ) {
- continue;
- }
-
- $swap_post_id = $order[ $menu_order + 1 ];
- $order[ $menu_order + 1 ] = $post_id;
- $order[ $menu_order ] = $swap_post_id;
-
- $reorder = true;
- }
- }
-
- if ( $reorder ) {
- foreach ( $order as $menu_order => $id ) {
- wp_update_post( compact( 'id', 'menu_order' ) );
- }
- }
-
- break;
- case 'move-menu-up':
- case 'move-menu-down':
- $reorder = false;
-
- if ( empty( $_GET['term_id'] ) ) {
- break;
- }
-
- $term_id = (int) $_GET['term_id'];
-
- $terms = $this->get_menus();
-
- $order = array();
- foreach ( $terms as $term ) {
- $order[] = $term->term_id;
- }
-
- if ( 'move-menu-up' === $action ) {
- check_admin_referer( 'nova_move_menu_up_' . $term_id );
-
- $first_term_id = $order[0];
- if ( $term_id === $first_term_id ) {
- break;
- }
-
- foreach ( $order as $menu_order => $order_term_id ) {
- if ( $term_id !== $order_term_id ) {
- continue;
- }
-
- $swap_term_id = $order[ $menu_order - 1 ];
- $order[ $menu_order - 1 ] = $term_id;
- $order[ $menu_order ] = $swap_term_id;
-
- $reorder = true;
- break;
- }
- } else {
- check_admin_referer( 'nova_move_menu_down_' . $term_id );
-
- $last_term_id = end( $order );
- if ( $term_id === $last_term_id ) {
- break;
- }
-
- foreach ( $order as $menu_order => $order_term_id ) {
- if ( $term_id !== $order_term_id ) {
- continue;
- }
-
- $swap_term_id = $order[ $menu_order + 1 ];
- $order[ $menu_order + 1 ] = $term_id;
- $order[ $menu_order ] = $swap_term_id;
-
- $reorder = true;
- }
- }
-
- if ( $reorder ) {
- update_option( 'nova_menu_order', $order );
- }
-
- break;
- default:
- return;
- }
-
- $redirect = add_query_arg(
- array(
- 'post_type' => self::MENU_ITEM_POST_TYPE,
- 'nova_reordered' => '1',
- ),
- admin_url( 'edit.php' )
- );
- wp_safe_redirect( $redirect );
- exit;
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->handle_menu_item_actions();
}
/**
* Add menu title rows to the list table
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param WP_Post $post The Post object.
*
* @return void
*/
public function show_menu_titles_in_menu_item_list( $post ) {
- global $wp_list_table;
-
- static $last_term_id = false;
-
- $term = $this->get_menu_item_menu_leaf( $post->ID );
-
- $term_id = $term instanceof WP_Term ? $term->term_id : null;
-
- if ( false !== $last_term_id && $last_term_id === $term_id ) {
- return;
- }
-
- if ( $term_id === null ) {
- $last_term_id = null;
- $term_name = '';
- $parent_count = 0;
- } else {
- $last_term_id = $term->term_id;
- $term_name = $term->name;
- $parent_count = 0;
- $current_term = $term;
- while ( $current_term->parent ) {
- ++$parent_count;
- $current_term = get_term( $current_term->parent, self::MENU_TAX );
- }
- }
-
- $non_order_column_count = $wp_list_table->get_column_count() - 1;
-
- $screen = get_current_screen();
-
- $url = admin_url( $screen->parent_file );
-
- $up_url = add_query_arg(
- array(
- 'action' => 'move-menu-up',
- 'term_id' => (int) $term_id,
- ),
- wp_nonce_url( $url, 'nova_move_menu_up_' . $term_id )
- );
-
- $down_url = add_query_arg(
- array(
- 'action' => 'move-menu-down',
- 'term_id' => (int) $term_id,
- ),
- wp_nonce_url( $url, 'nova_move_menu_down_' . $term_id )
- );
-
- ?>
-
- new_instance->show_menu_titles_in_menu_item_list( $post );
}
/* Edit Many Items */
@@ -1122,205 +457,49 @@ public function show_menu_titles_in_menu_item_list( $post ) {
* Handle form submissions that aim to add many menu items at once.
* (process posted data and enqueue necessary script).
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @return void
*/
public function add_many_new_items_page_load() {
- if (
- isset( $_SERVER['REQUEST_METHOD'] )
- && 'POST' === strtoupper( sanitize_text_field( wp_unslash( $_SERVER['REQUEST_METHOD'] ) ) )
- ) {
- $this->process_form_request();
- exit;
- }
-
- $this->enqueue_many_items_scripts();
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->add_many_new_items_page_load();
}
/**
* Enqueue script to create many items at once.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @return void
*/
public function enqueue_many_items_scripts() {
- wp_enqueue_script(
- 'nova-many-items',
- Assets::get_file_url_for_environment(
- '_inc/build/custom-post-types/js/many-items.min.js',
- 'modules/custom-post-types/js/many-items.js'
- ),
- array(),
- $this->version,
- true
- );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->enqueue_many_items_scripts();
}
/**
* Process form request to create many items at once.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @return void
*/
public function process_form_request() {
- if ( ! isset( $_POST['nova_title'] ) || ! is_array( $_POST['nova_title'] ) ) {
- return;
- }
-
- $is_ajax = ! empty( $_POST['ajax'] );
-
- if ( $is_ajax ) {
- check_ajax_referer( 'nova_many_items' );
- } else {
- check_admin_referer( 'nova_many_items' );
- }
-
- /*
- * $_POST is already slashed
- * phpcs:disable WordPress.Security.ValidatedSanitizedInput.MissingUnslash
- */
- foreach ( array_keys( $_POST['nova_title'] ) as $key ) : // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- we sanitize below.
- $post_details = array(
- 'post_status' => 'publish',
- 'post_type' => self::MENU_ITEM_POST_TYPE,
- 'post_content' => ! empty( $_POST['nova_content'] ) && ! empty( $_POST['nova_content'][ $key ] )
- ? sanitize_text_field( $_POST['nova_content'][ $key ] )
- : '',
- 'post_title' => isset( $_POST['nova_title'][ $key ] )
- ? sanitize_title( $_POST['nova_title'][ $key ] )
- : '',
- 'tax_input' => array(
- self::MENU_ITEM_LABEL_TAX => isset( $_POST['nova_labels'][ $key ] )
- ? sanitize_meta( self::MENU_ITEM_LABEL_TAX, $_POST['nova_labels'][ $key ], 'term' )
- : null,
- self::MENU_TAX => isset( $_POST['nova_menu_tax'] )
- ? sanitize_meta( self::MENU_TAX, $_POST['nova_menu_tax'], 'term' )
- : null,
- ),
- );
-
- $post_id = wp_insert_post( $post_details );
- if ( ! $post_id || is_wp_error( $post_id ) ) {
- continue;
- }
-
- $this->set_price(
- $post_id,
- isset( $_POST['nova_price'][ $key ] )
- ? sanitize_meta( 'nova_price', $_POST['nova_price'][ $key ], 'post' )
- : ''
- );
- // phpcs:enable WordPress.Security.ValidatedSanitizedInput.MissingUnslash
-
- if ( $is_ajax ) :
- $post = get_post( $post_id );
- $GLOBALS['post'] = $post; // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
- setup_postdata( $post );
-
- ?>
- |
- display_price(); ?> |
- list_labels( $post_id ); ?> |
- |
- new_instance->process_form_request();
}
/**
* Admin page contents for adding many menu items at once.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @return void
*/
public function add_many_new_items_page() {
- ?>
-
-
-
-
- TAB key on your keyboard to move between colums and the ENTER or RETURN key to save each row and move on to the next.', 'jetpack' ),
- array(
- 'kbd' => array(),
- )
- );
- ?>
-
-
-
-
- new_instance->add_many_new_items_page();
}
/* Edit One Item */
@@ -1329,51 +508,39 @@ public function add_many_new_items_page() {
* Create admin meta box to save price for a menu item,
* and add script to add extra checkboxes to the UI.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @return void
*/
public function register_menu_item_meta_boxes() {
- wp_enqueue_script( 'nova-menu-checkboxes' );
-
- add_meta_box(
- 'menu_item_price',
- __( 'Price', 'jetpack' ),
- array( $this, 'menu_item_price_meta_box' ),
- null,
- 'side',
- 'high'
- );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->register_menu_item_meta_boxes();
}
/**
* Meta box to edit the price of a menu item.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param WP_Post $post The post object.
*
* @return void
*/
public function menu_item_price_meta_box( $post ) {
- printf(
- ' ',
- (int) $post->ID,
- esc_html__( 'Price', 'jetpack' ),
- esc_attr( $this->get_price( (int) $post->ID ) )
- );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->menu_item_price_meta_box( $post );
}
/**
* Save the price of a menu item.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param int $post_id Post ID.
*/
public function add_post_meta( $post_id ) {
- if ( ! isset( $_POST['nova_price'][ $post_id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing -- nonce handling happens via core, since we hook into wp_insert_post.
- return;
- }
-
- $this->set_price(
- $post_id,
- sanitize_meta( 'nova_price', wp_unslash( $_POST['nova_price'][ $post_id ] ), 'post' ) // phpcs:ignore WordPress.Security.NonceVerification.Missing -- nonce handling happens via core, since we hook into wp_insert_post.
- );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->add_post_meta( $post_id );
}
/* Data */
@@ -1381,152 +548,100 @@ public function add_post_meta( $post_id ) {
/**
* Get ordered array of menu items.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param array $args Optional argumments.
*
* @return array
*/
public function get_menus( $args = array() ) {
- $args = wp_parse_args(
- $args,
- array(
- 'hide_empty' => false,
- )
- );
- $args['taxonomy'] = self::MENU_TAX;
-
- $terms = get_terms( $args );
- if ( ! $terms || is_wp_error( $terms ) ) {
- return array();
- }
-
- $terms_by_id = array();
- foreach ( $terms as $term ) {
- $terms_by_id[ "{$term->term_id}" ] = $term;
- }
-
- $term_order = get_option( 'nova_menu_order', array() );
-
- $return = array();
- foreach ( $term_order as $term_id ) {
- if ( isset( $terms_by_id[ "$term_id" ] ) ) {
- $return[] = $terms_by_id[ "$term_id" ];
- unset( $terms_by_id[ "$term_id" ] );
- }
- }
-
- foreach ( $terms_by_id as $term_id => $term ) {
- $return[] = $term;
- }
-
- return $return;
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ return $this->new_instance->get_menus( $args );
}
/**
* Get first menu taxonomy "leaf".
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param int $post_id Post ID.
*
* @return bool|WP_Term|WP_Error|null
*/
public function get_menu_item_menu_leaf( $post_id ) {
- // Get first menu taxonomy "leaf".
- $term_ids = wp_get_object_terms( $post_id, self::MENU_TAX, array( 'fields' => 'ids' ) );
-
- foreach ( $term_ids as $term_id ) {
- $children = get_term_children( $term_id, self::MENU_TAX );
- if ( ! $children ) {
- break;
- }
- }
-
- if ( ! isset( $term_id ) ) {
- return false;
- }
-
- return get_term( $term_id, self::MENU_TAX );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ return $this->new_instance->get_menu_item_menu_leaf( $post_id );
}
/**
* Get a list of the labels linked to a menu item.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param int $post_id Post ID.
*
* @return void
*/
public function list_labels( $post_id = 0 ) {
- $post = get_post( $post_id );
- echo get_the_term_list( $post->ID, self::MENU_ITEM_LABEL_TAX, '', _x( ', ', 'Nova label separator', 'jetpack' ), '' );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->list_labels( $post_id );
}
/**
* Get a list of the labels linked to a menu item, with links to manage them.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param int $post_id Post ID.
*
* @return void
*/
public function list_admin_labels( $post_id = 0 ) {
- $post = get_post( $post_id );
- $labels = get_the_terms( $post->ID, self::MENU_ITEM_LABEL_TAX );
- if ( ! empty( $labels ) ) {
- $out = array();
- foreach ( $labels as $label ) {
- $out[] = sprintf(
- ' %s',
- esc_url(
- add_query_arg(
- array(
- 'post_type' => self::MENU_ITEM_POST_TYPE,
- 'taxonomy' => self::MENU_ITEM_LABEL_TAX,
- 'term' => $label->slug,
- ),
- 'edit.php'
- )
- ),
- esc_html(
- sanitize_term_field( 'name', $label->name, $label->term_id, self::MENU_ITEM_LABEL_TAX, 'display' )
- )
- );
- }
-
- echo implode( _x( ', ', 'Nova label separator', 'jetpack' ), $out ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- we build $out ourselves and escape things there.
- } else {
- esc_html_e( 'No Labels', 'jetpack' );
- }
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->list_admin_labels( $post_id );
}
/**
* Update post meta with the price defined in meta box.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param int $post_id Post ID.
* @param string $price Price.
*
* @return int|bool
*/
public function set_price( $post_id = 0, $price = '' ) {
- return update_post_meta( $post_id, 'nova_price', $price );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ return $this->new_instance->set_price( $post_id, $price );
}
/**
* Get the price of a menu item.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param int $post_id Post ID.
*
* @return bool|string
*/
public function get_price( $post_id = 0 ) {
- return get_post_meta( $post_id, 'nova_price', true );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ return $this->new_instance->get_price( $post_id );
}
/**
* Echo the price of a menu item.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param int $post_id Post ID.
*
* @return void
*/
public function display_price( $post_id = 0 ) {
- echo esc_html( $this->get_price( $post_id ) );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->display_price( $post_id );
}
/* Menu Item Loop Markup */
@@ -1535,12 +650,15 @@ public function display_price( $post_id = 0 ) {
* Get markup for a menu item.
* Note: Does not support nested loops.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param null|string $field The field to get the value for.
*
* @return array
*/
public function get_menu_item_loop_markup( $field = null ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
- return $this->menu_item_loop_markup;
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ return $this->new_instance->get_menu_item_loop_markup( $field );
}
/**
@@ -1548,201 +666,114 @@ public function get_menu_item_loop_markup( $field = null ) { // phpcs:ignore Var
* Attached to the 'template_include' *filter*,
* which fires only during a real blog view (not in admin, feeds, etc.)
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param string $template Template File.
*
* @return string Template File. VERY Important.
*/
public function setup_menu_item_loop_markup__in_filter( $template ) {
- add_action( 'loop_start', array( $this, 'start_menu_item_loop' ) );
-
- return $template;
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ return $this->new_instance->setup_menu_item_loop_markup__in_filter( $template );
}
/**
* If the Query is a Menu Item Query, start outputing the Menu Item Loop Marku
* Attached to the 'loop_start' action.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param WP_Query $query Post query.
*
* @return void
*/
public function start_menu_item_loop( $query ) {
- if ( ! $this->is_menu_item_query( $query ) ) {
- return;
- }
-
- $this->menu_item_loop_last_term_id = false;
- $this->menu_item_loop_current_term = false;
-
- add_action( 'the_post', array( $this, 'menu_item_loop_each_post' ) );
- add_action( 'loop_end', array( $this, 'stop_menu_item_loop' ) );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->start_menu_item_loop( $query );
}
/**
* Outputs the Menu Item Loop Marku
* Attached to the 'the_post' action.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param WP_Post $post Post object.
*
* @return void
*/
public function menu_item_loop_each_post( $post ) {
- $this->menu_item_loop_current_term = $this->get_menu_item_menu_leaf( $post->ID );
-
- if (
- false === $this->menu_item_loop_current_term
- || null === $this->menu_item_loop_current_term
- || is_wp_error( $this->menu_item_loop_current_term )
- ) {
- return;
- }
-
- if ( false === $this->menu_item_loop_last_term_id ) {
- // We're at the very beginning of the loop
-
- $this->menu_item_loop_open_element( 'menu' ); // Start a new menu section
- $this->menu_item_loop_header(); // Output the menu's header
- } elseif ( $this->menu_item_loop_last_term_id !== $this->menu_item_loop_current_term->term_id ) {
- // We're not at the very beginning but still need to start a new menu section. End the previous menu section first.
-
- $this->menu_item_loop_close_element( 'menu' ); // End the previous menu section
- $this->menu_item_loop_open_element( 'menu' ); // Start a new menu section
- $this->menu_item_loop_header(); // Output the menu's header
- }
-
- $this->menu_item_loop_last_term_id = $this->menu_item_loop_current_term->term_id;
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->menu_item_loop_each_post( $post );
}
/**
* If the Query is a Menu Item Query, stop outputing the Menu Item Loop Marku
* Attached to the 'loop_end' action.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param WP_Query $query Post query.
*
* @return void
*/
public function stop_menu_item_loop( $query ) {
- if ( ! $this->is_menu_item_query( $query ) ) {
- return;
- }
-
- remove_action( 'the_post', array( $this, 'menu_item_loop_each_post' ) );
- remove_action( 'loop_start', array( $this, 'start_menu_item_loop' ) );
- remove_action( 'loop_end', array( $this, 'stop_menu_item_loop' ) );
-
- $this->menu_item_loop_close_element( 'menu' ); // End the last menu section
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->stop_menu_item_loop( $query );
}
/**
* Outputs the Menu Group Header
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @return void
*/
public function menu_item_loop_header() {
- $this->menu_item_loop_open_element( 'menu_header' );
- $this->menu_item_loop_open_element( 'menu_title' );
- echo esc_html( $this->menu_item_loop_current_term->name ); // @todo tax filter
- $this->menu_item_loop_close_element( 'menu_title' );
- if ( $this->menu_item_loop_current_term->description ) :
- $this->menu_item_loop_open_element( 'menu_description' );
- echo esc_html( $this->menu_item_loop_current_term->description ); // @todo kses, tax filter
- $this->menu_item_loop_close_element( 'menu_description' );
- endif;
- $this->menu_item_loop_close_element( 'menu_header' );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->menu_item_loop_header();
}
/**
* Outputs a Menu Item Markup element opening tag
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param string $field - Menu Item Markup settings field.
*
* @return void
*/
public function menu_item_loop_open_element( $field ) {
- $markup = $this->get_menu_item_loop_markup();
- /**
- * Filter a menu item's element opening tag.
- *
- * @module custom-content-types
- *
- * @since 4.4.0
- *
- * @param string $tag Menu item's element opening tag.
- * @param string $field Menu Item Markup settings field.
- * @param array $markup Array of markup elements for the menu item.
- * @param false|object $term Taxonomy term for current menu item.
- */
- echo apply_filters( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- it's escaped in menu_item_loop_class.
- 'jetpack_nova_menu_item_loop_open_element',
- '<' . tag_escape( $markup[ "{$field}_tag" ] ) . $this->menu_item_loop_class( $markup[ "{$field}_class" ] ) . ">\n",
- $field,
- $markup,
- $this->menu_item_loop_current_term
- );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->menu_item_loop_open_element( $field );
}
/**
* Outputs a Menu Item Markup element closing tag
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param string $field - Menu Item Markup settings field.
*
* @return void
*/
public function menu_item_loop_close_element( $field ) {
- $markup = $this->get_menu_item_loop_markup();
- /**
- * Filter a menu item's element closing tag.
- *
- * @module custom-content-types
- *
- * @since 4.4.0
- *
- * @param string $tag Menu item's element closing tag.
- * @param string $field Menu Item Markup settings field.
- * @param array $markup Array of markup elements for the menu item.
- * @param false|object $term Taxonomy term for current menu item.
- */
- echo apply_filters( // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- tag_escape is used.
- 'jetpack_nova_menu_item_loop_close_element',
- '\n",
- $field,
- $markup,
- $this->menu_item_loop_current_term
- );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ $this->new_instance->menu_item_loop_close_element( $field );
}
/**
* Returns a Menu Item Markup element's class attribute.
*
+ * @deprecated 14.3 Moved to Classic Theme Helper package.
+ *
* @param string $class Class name.
*
* @return string HTML class attribute with leading whitespace.
*/
public function menu_item_loop_class( $class ) {
- if ( ! $class ) {
- return '';
- }
-
- /**
- * Filter a menu Item Markup element's class attribute.
- *
- * @module custom-content-types
- *
- * @since 4.4.0
- *
- * @param string $tag Menu Item Markup element's class attribute.
- * @param string $class Menu Item Class name.
- * @param false|object $term Taxonomy term for current menu item.
- */
- return apply_filters(
- 'jetpack_nova_menu_item_loop_class',
- ' class="' . esc_attr( $class ) . '"',
- $class,
- $this->menu_item_loop_current_term
- );
+ _deprecated_function( __FUNCTION__, 'jetpack-14.3' );
+ return $this->new_instance->menu_item_loop_class( $class );
}
}
-
- add_action( 'init', array( 'Nova_Restaurant', 'init' ) );
-
-}
\ No newline at end of file
+}
diff --git a/projects/plugins/jetpack/modules/module-extras.php b/projects/plugins/jetpack/modules/module-extras.php
index 3d06191331bb7..5fe23809b9ed0 100644
--- a/projects/plugins/jetpack/modules/module-extras.php
+++ b/projects/plugins/jetpack/modules/module-extras.php
@@ -14,7 +14,6 @@
*/
$tools = array(
// Always loaded, but only registered if theme supports it.
- 'custom-post-types/nova.php',
'geo-location.php',
// Those oEmbed providers are always available.
'shortcodes/facebook.php',
diff --git a/projects/plugins/jetpack/modules/notes.php b/projects/plugins/jetpack/modules/notes.php
index 58f2d612759a0..8f6118938c413 100644
--- a/projects/plugins/jetpack/modules/notes.php
+++ b/projects/plugins/jetpack/modules/notes.php
@@ -192,12 +192,16 @@ public function admin_bar_menu() {
$third_party_cookie_check_iframe = ' ';
$title = self::get_notes_markup();
+
+ // The default fallback is `en_US`. Remove underscore if present, noting that lang codes can be more than three chars.
+ $user_locale = strtolower( explode( '_', $user_locale, 2 )[0] );
+
$wp_admin_bar->add_menu(
array(
'id' => 'notes',
'title' => $title,
'meta' => array(
- 'html' => ' ' . $third_party_cookie_check_iframe,
+ 'html' => ' ' . $third_party_cookie_check_iframe,
'class' => 'menupop',
),
'parent' => 'top-secondary',
diff --git a/projects/plugins/jetpack/package.json b/projects/plugins/jetpack/package.json
index 38dc725572d10..5885e3bd71c20 100644
--- a/projects/plugins/jetpack/package.json
+++ b/projects/plugins/jetpack/package.json
@@ -1,6 +1,6 @@
{
"name": "Jetpack",
- "version": "14.2.0",
+ "version": "14.3.0-a.1",
"private": true,
"description": "[Jetpack](https://jetpack.com/) is a WordPress plugin that supercharges your self-hosted WordPress site with the awesome cloud power of [WordPress.com](https://wordpress.com).",
"homepage": "https://jetpack.com",
@@ -104,7 +104,7 @@
"postcss-custom-properties": "12.1.7",
"prop-types": "15.8.1",
"react-redux": "7.2.8",
- "react-router-dom": "5.3.4",
+ "react-router-dom": "6.28.0",
"redux": "4.0.5",
"redux-thunk": "2.3.0",
"refx": "3.1.1",
diff --git a/projects/plugins/jetpack/readme.txt b/projects/plugins/jetpack/readme.txt
index 99e34c13ea8eb..9c7b5b4aa5cde 100644
--- a/projects/plugins/jetpack/readme.txt
+++ b/projects/plugins/jetpack/readme.txt
@@ -1,7 +1,7 @@
=== Jetpack - WP Security, Backup, Speed, & Growth ===
Contributors: automattic, adamkheckler, adrianmoldovanwp, aduth, akirk, allendav, alternatekev, andy, annamcphee, annezazu, apeatling, arcangelini, arsihasi, azaozz, barry, batmoo, beaulebens, bindlegirl, biskobe, bjorsch, blobaugh, brbrr, brileyhooper, cainm, cena, cfinke, cgastrell, chaselivingston, chellycat, clickysteve, csonnek, danielbachhuber, daniloercoli, davoraltman, delawski, designsimply, dkmyta, dllh, drawmyface, dsmart, dun2mis, dzver, ebinnion, egregor, eliorivero, enej, eoigal, erania-pinnera, ethitter, fgiannar, gcorne, georgestephanis, gibrown, goldsounds, hew, hugobaeta, hypertextranch, iammattthomas, iandunn, joen, jblz, jeffgolenski, jeherve, jenhooks, jenia, jessefriedman, jgs, jkudish, jmdodd, joanrho, johnjamesjacoby, jshreve, kbrownkd, keoshi, koke, kraftbj, lancewillett, leogermani, lhkowalski, lschuyler, macmanx, martinremy, matt, mattwiebe, matveb, maverick3x6, mcsf, mdawaffe, mdbitz, MichaelArestad, migueluy, miguelxavierpenha, mikeyarce, mkaz, nancythanki, nickmomrik, njweller, nunyvega, obenland, oskosk, pento, professor44, rachelsquirrel, rdcoll, renatoagds, retrofox, richardmtl, richardmuscat, robertbpugh, roccotripaldi, ryancowles, samhotchkiss, samiff, scarstocea, scottsweb, sdixon194, sdquirk, sermitr, simison, stephdau, thehenridev, tmoorewp, tyxla, Viper007Bond, westi, williamvianas, wpkaren, yoavf, zinigor
Tags: Security, backup, malware, scan, performance
-Stable tag: 14.1
+Stable tag: 14.2
Requires at least: 6.6
Requires PHP: 7.2
Tested up to: 6.7
@@ -326,29 +326,16 @@ Jetpack Backup can do a full website migration to a new host, migrate theme file
== Changelog ==
-### 14.2 - 2025-01-07
-#### Enhancements
-- Social: Improve Jetpack Likes behavior for better theme integration if the post has likes.
-- Stats: Allow programatically fetching stats for specific sites when using Jetpack's tools.
-- Stats: Enable sparkline chart in the WP Admin bar.
-- Stats: Sunset Legacy Stats experience.
-
+### 14.3-a.1 - 2025-01-13
#### Improved compatibility
-- Google Photos Picker: Update UX opening picker right after pressing "change selection" CTA.
-- Jetpack Testimonials: Ensure feature loads via the Classic Theme Helper package instead of the module.
-- SEO: Ensure support for adding an SEO title and description for custom post types.
-- WordPress 6.7 Compatibility: Fix notices caused by translation calls happening too early in the load order.
+- Nova Restaurant: ensure that the custom post type is now loaded via the Classic Theme Helper package.
#### Bug fixes
-- Facebook Embeds: Add a white background to embeds to avoid transparent background interfering with readability.
-- Form Block: Fix validation of URL input types to allow query strings.
-- Google Fonts: Clean up the Google Fonts data if either the Google Fonts module is disabled or Jetpack is disabled.
-- Import: Set WP_IMPORTING constant correctly when doing an import.
-- SEO: Ensure that SEO fields are not visible when another SEO plugin is active.
-- Shortcode embeds: Ensure Instagram reels are properly displayed in AMP views.
-- Shortcodes: Prevent conflict with third-party SoundCloud shortcodes.
-- Slideshow block: Fix block display when added within a Stack block.
-- WooCommerce Analytics: Fix fatal error when WooCommerce cart object is not available.
+- Authors widget: Fix saving of unchecked "Display all authors" checkbox in the legacy widget editor.
+- Stats: Fix saving of custom roles settings.
+- Pages and Posts: Fix the layout on mobile when details are open.
+- Testimonials: Fix shortcode-related bug.
+- Tiled Gallery block: Ensure icons are visible when selecting image in editor.
--------
diff --git a/projects/plugins/jetpack/to-test.md b/projects/plugins/jetpack/to-test.md
index 54a624f7ade24..0cd47c56900d0 100644
--- a/projects/plugins/jetpack/to-test.md
+++ b/projects/plugins/jetpack/to-test.md
@@ -1,4 +1,4 @@
-## Jetpack 14.2
+## Jetpack 14.3
### Before you start:
@@ -14,64 +14,6 @@ You can see a [full list of changes in this release here](https://github.com/Aut
## General testing
-Jetpack 14.2 has been affected by changes that aim to improve performance and reduce unused code. Please take note of any things that you think are wrong, if you see any such behavior.
-
-## Jetpack AI
-
-### Featured Image
-
-Previousl when a featured image was already set, the Featured Image generator modal showed up empty on open. Since Jetpack 14.2 , if a featured image is set, we load it on the modal for visibility. To make sure it works as intended, open the editor with a new post. Click on Sidebar's "Set featured image" and select "Generate with AI".
-
-- Opening the featured image generator modal with not context (no post content nor title) should open and do nothing.
-- If you close the modal, add a title or some content on the post and open the modal again, this time an image generation should trigger.
-- If you set the generated image as featured image and close the modal and open the modal again, see the current featured image should show on the modal and no generation should be triggered.
-
-### Thumbs up/down on AI Logo Generator
-
-The Logo Generator now has thums up/down buttons for rating generated images. Testing them requires enabling beta blocks, as mentioned in the beginning of this document. To test this feature:
-
-- Create a new post, insert a logo block, and use the AI logo generator to generate a new logo or browse your existing logos.
-- Verify that there are no thumbs next to the "Use on block" button.
-- Enable the feature: with `add_filter( 'ai_response_feedback_enabled', '__return_true' );`
-- Reload your post and open the logo generator again.
-- Verify that a thumbs up/down appears next to the "Use on block" button.
-- You should be able to click on the thumbs up or down and observe that the thumb changes color.
-- Viewing other logos you have should show their rating (which will likely be no rating), and if you go back to a logo you already rated the same rating should be present.
-- Check that ratings are persisted after reload
-
-## Support for Instagram Reels in AMP
-
-In addition to support for Instagram Reel links Jetpack now supports reels and videos in AMP views. To test:
-
-- Go to Jetpack > Settings > Writing and enable Shortcodes.
-- Go to Plugins > Add New and install and activate the AMP plugin.
-- Open the AMP onboarding wizard, and enable "Reader" mode.
-- Go to Posts > Add New, make sure to add a shortcode block with the following content: `[instagram url="https://instagram.com/reel/COWmlFLB_7P/"]`
-- Publish your post and view it on the frontend.
-- You should see the embed work in regular view.
-- Click on the AMP option in the admin bar.
-- You should see the embed work in the AMP view too.
-
-## Restaurant Menu and Testimonials CPTs
-
-The Restaurant Menu Custom Post Type has been moved to a separate theme helper package. The package isn't being used yet, but we should make sure that nothing is being added via the package. To do that you would need to install and activate a theme that supports Restaurant Menus such as Confit:
-
-- Add several new menu items from the new Food Menu in the admin menu.
-- Add some new sections, and add menu items to specific sections (see the Menu Sections area in the menu editor). Ensure some sections are parents to other sections
-- Attempt adding multiple menu items at once using the 'Add Many Items' menu option.
-- Using quick edit from the main menu list for specific item, change the sections they belong to in some cases.
-- Try dragging and dropping menu items to different positions and sections.
-- Click save new order, everything should save correctly.
-
-In addition to that, the Testimonials CPT is also now included from a separate package. To make sure things are OK:
-
-- Ensure you can activate Testimonials via Jetpack > Settings > Writing (see the Custom Content Types section).
-- Test that Testimonial functionality works as expected: Create a new Testimonial via the Testimonial wp-admin menu. View it. Add it to another post via the testimonial shortcode (`[testimonials]`).
-- Test that a theme that supports Jetpack Testimonials auto-activates it: Make sure Testimonials are not active, and then install and activate the Lodestar theme. Testimonials should now be active.
-- Try visiting /wp-admin/edit.php?post_type=jetpack-testimonial when Testimonial is toggled off - you should see an 'invalid post type' message, and on the front-end on a post which made use of the Testimonials shortcode, you should see the unrendered shortcode.
-- Generally test that toggling on and off the Testimonials feature results in expected Testimonial functionality being visible and not visible - including the Testimonials menu item display in the main wp-admin menu.
-- Test as well with the toggles at `/wp-admin/options-writing.php` (noting that toggling off isn't possible when a theme supports Portfolios or Testimonials), and Calypso Blue at `https://wordpress.com/settings/writing/yoursiteurl.com`.
-- Test with Portfolios active and not active as well, in terms of how that impacts Testimonials, though there are some testing quirks around that depending on the theme (see below).
-- Make sure there are no deprecation notices in error logs while testing.
+Once ready for testing, you'll find instructions here.
**Thank you for all your help!**
diff --git a/projects/plugins/mu-wpcom-plugin/CHANGELOG.md b/projects/plugins/mu-wpcom-plugin/CHANGELOG.md
index cd93fc78e7131..4109e0ef0df9d 100644
--- a/projects/plugins/mu-wpcom-plugin/CHANGELOG.md
+++ b/projects/plugins/mu-wpcom-plugin/CHANGELOG.md
@@ -5,6 +5,19 @@ 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).
+## 2.7.0 - 2025-01-10
+### Added
+- WordPress.com Features: Add Holiday Snow functionality. [#40478]
+
+### Changed
+- Newspack Blocks: Update to version 4.5.2. [#40636]
+- Updated dependencies. [#40286]
+- Updated package dependencies. [#40116] [#40515]
+
+### Fixed
+- Global Styles: Stop showing the limited global styles notice in distraction-free mode. [#40907]
+- Testimonials: Fix a shortcode related bug which ccurs if the column attribute is added and set to 0. [#40896]
+
## 2.6.1 - 2024-11-11
### Changed
- Internal updates.
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/add-ci-always-process-coverage b/projects/plugins/mu-wpcom-plugin/changelog/add-ci-always-process-coverage
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/add-ci-always-process-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/fix-order-of-services b/projects/plugins/mu-wpcom-plugin/changelog/add-masterbar-watch
similarity index 54%
rename from projects/plugins/social/changelog/fix-order-of-services
rename to projects/plugins/mu-wpcom-plugin/changelog/add-masterbar-watch
index 8f7a66077dab9..dba2d7dd92db5 100644
--- a/projects/plugins/social/changelog/fix-order-of-services
+++ b/projects/plugins/mu-wpcom-plugin/changelog/add-masterbar-watch
@@ -1,4 +1,4 @@
Significance: minor
Type: changed
-Change order of connections.
+update composer.lock files
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/add-pre-option-filter-duplicate-views b/projects/plugins/mu-wpcom-plugin/changelog/add-pre-option-filter-duplicate-views
deleted file mode 100644
index 19105e05f270e..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/add-pre-option-filter-duplicate-views
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Changes related to WoA
-
-
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/feat-introduce-wpcom-external-media-import-page b/projects/plugins/mu-wpcom-plugin/changelog/feat-introduce-wpcom-external-media-import-page
new file mode 100644
index 0000000000000..a2aefd2a0c34c
--- /dev/null
+++ b/projects/plugins/mu-wpcom-plugin/changelog/feat-introduce-wpcom-external-media-import-page
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Import Media: Introduce the Import Media page
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/fix-bump_composer_versions b/projects/plugins/mu-wpcom-plugin/changelog/fix-bump_composer_versions
deleted file mode 100644
index 13cbf3392f78d..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/fix-bump_composer_versions
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated dependencies.
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/fix-bump_composer_versions_round2 b/projects/plugins/mu-wpcom-plugin/changelog/fix-bump_composer_versions_round2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/fix-bump_composer_versions_round2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/prerelease#2 b/projects/plugins/mu-wpcom-plugin/changelog/prerelease#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/prerelease#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/prerelease#3 b/projects/plugins/mu-wpcom-plugin/changelog/prerelease#3
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/prerelease#3
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/prerelease#4 b/projects/plugins/mu-wpcom-plugin/changelog/prerelease#4
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/prerelease#4
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/prerelease#5 b/projects/plugins/mu-wpcom-plugin/changelog/prerelease#5
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/prerelease#5
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/prerelease#6 b/projects/plugins/mu-wpcom-plugin/changelog/prerelease#6
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/prerelease#6
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/prerelease#7 b/projects/plugins/mu-wpcom-plugin/changelog/prerelease#7
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/prerelease#7
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/prerelease#8 b/projects/plugins/mu-wpcom-plugin/changelog/prerelease#8
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/prerelease#8
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/renovate-brain-monkey-2.x b/projects/plugins/mu-wpcom-plugin/changelog/renovate-brain-monkey-2.x
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/renovate-brain-monkey-2.x
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/renovate-lock-file-maintenance#5 b/projects/plugins/mu-wpcom-plugin/changelog/renovate-lock-file-maintenance#5
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/renovate-lock-file-maintenance#5
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/update-bump_min_php_to_7.2 b/projects/plugins/mu-wpcom-plugin/changelog/update-bump_min_php_to_7.2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/update-bump_min_php_to_7.2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/update-composer b/projects/plugins/mu-wpcom-plugin/changelog/update-composer
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/update-composer
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/update-synced_newspack_blocks b/projects/plugins/mu-wpcom-plugin/changelog/update-synced_newspack_blocks
deleted file mode 100644
index 15206e680281d..0000000000000
--- a/projects/plugins/mu-wpcom-plugin/changelog/update-synced_newspack_blocks
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: changed
-
-Newspack Blocks: Updated to version 4.5.2.
diff --git a/projects/plugins/mu-wpcom-plugin/composer.json b/projects/plugins/mu-wpcom-plugin/composer.json
index 27235894849c1..03c52b5fd753d 100644
--- a/projects/plugins/mu-wpcom-plugin/composer.json
+++ b/projects/plugins/mu-wpcom-plugin/composer.json
@@ -45,6 +45,6 @@
"release-branch-prefix": "mu-wpcom"
},
"config": {
- "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_6_1"
+ "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_7_0"
}
}
diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock
index 0e2d71f5cca40..662e6a1ca2e0e 100644
--- a/projects/plugins/mu-wpcom-plugin/composer.lock
+++ b/projects/plugins/mu-wpcom-plugin/composer.lock
@@ -407,7 +407,7 @@
"dist": {
"type": "path",
"url": "../../packages/classic-theme-helper",
- "reference": "198fd841c5341850e247c46168d77b1bc6a13a34"
+ "reference": "97a68997e5f3dc805df942c53586bab3f2137427"
},
"require": {
"automattic/jetpack-assets": "@dev",
@@ -425,7 +425,7 @@
"extra": {
"autotagger": true,
"branch-alias": {
- "dev-trunk": "0.8.x-dev"
+ "dev-trunk": "0.9.x-dev"
},
"changelogger": {
"link-template": "https://github.com/Automattic/jetpack-classic-theme-helper/compare/v${old}...v${new}"
@@ -971,7 +971,7 @@
"dist": {
"type": "path",
"url": "../../packages/masterbar",
- "reference": "f4317f289a90af787f81e695268be1ef00cd0255"
+ "reference": "f26d6309fe2d4ef4298d616f25f4e4d815c388bd"
},
"require": {
"automattic/jetpack-assets": "@dev",
@@ -1044,6 +1044,10 @@
"test-php": [
"pnpm run build-production",
"@composer phpunit"
+ ],
+ "watch": [
+ "Composer\\Config::disableProcessTimeout",
+ "pnpm run watch"
]
},
"license": [
@@ -1060,7 +1064,7 @@
"dist": {
"type": "path",
"url": "../../packages/jetpack-mu-wpcom",
- "reference": "63f823f3817e4c126abd96fc971ad6c39c8f1f01"
+ "reference": "7004e837cd80b875b6bd42f1e984f9f5e9114e03"
},
"require": {
"automattic/jetpack-assets": "@dev",
@@ -1094,7 +1098,7 @@
},
"autotagger": true,
"branch-alias": {
- "dev-trunk": "6.0.x-dev"
+ "dev-trunk": "6.1.x-dev"
},
"textdomain": "jetpack-mu-wpcom",
"version-constants": {
@@ -1127,6 +1131,10 @@
],
"post-update-cmd": [
"WorDBless\\Composer\\InstallDropin::copy"
+ ],
+ "watch": [
+ "Composer\\Config::disableProcessTimeout",
+ "pnpm run watch"
]
},
"license": [
@@ -1585,7 +1593,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "ece2cb5be16c8bc399fb6681a61ffa42b42e3cf5"
+ "reference": "9f24b0cb0912e1e3f235e946b9f397ffd9e36ccf"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -1618,7 +1626,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "4.2.x-dev"
+ "dev-trunk": "4.3.x-dev"
},
"dependencies": {
"test-only": [
@@ -2018,16 +2026,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.1",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
"shasum": ""
},
"require": {
@@ -2070,9 +2078,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
},
- "time": "2024-10-08T18:51:32+00:00"
+ "time": "2024-12-30T11:07:19+00:00"
},
{
"name": "phar-io/manifest",
@@ -3632,16 +3640,16 @@
},
{
"name": "symfony/console",
- "version": "v7.2.0",
+ "version": "v7.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf"
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
+ "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
"shasum": ""
},
"require": {
@@ -3705,7 +3713,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.2.0"
+ "source": "https://github.com/symfony/console/tree/v7.2.1"
},
"funding": [
{
@@ -3721,7 +3729,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-06T14:24:19+00:00"
+ "time": "2024-12-11T03:49:26+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -3742,12 +3750,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4054,8 +4062,8 @@
"type": "library",
"extra": {
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -4193,12 +4201,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4391,16 +4399,16 @@
},
{
"name": "yoast/phpunit-polyfills",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be"
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
+ "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
"shasum": ""
},
"require": {
@@ -4450,7 +4458,7 @@
"security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
"source": "https://github.com/Yoast/PHPUnit-Polyfills"
},
- "time": "2024-09-06T22:03:10+00:00"
+ "time": "2025-01-08T16:58:34+00:00"
}
],
"aliases": [],
diff --git a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php
index d93096398aaab..f5adad830cee9 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.6.1
+ * Version: 2.7.0
* 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 b46cac42cc36c..bda5def29de5d 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.6.1",
+ "version": "2.7.0",
"description": "Test plugin for the jetpack-mu-wpcom package",
"homepage": "https://jetpack.com",
"bugs": {
diff --git a/projects/plugins/search/changelog/prerelease#12 b/projects/plugins/protect/changelog/prerelease#12
similarity index 100%
rename from projects/plugins/search/changelog/prerelease#12
rename to projects/plugins/protect/changelog/prerelease#12
diff --git a/projects/plugins/search/changelog/prerelease#13 b/projects/plugins/protect/changelog/prerelease#13
similarity index 100%
rename from projects/plugins/search/changelog/prerelease#13
rename to projects/plugins/protect/changelog/prerelease#13
diff --git a/projects/plugins/mu-wpcom-plugin/changelog/renovate-lock-file-maintenance#4 b/projects/plugins/protect/changelog/renovate-lock-file-maintenance#4
similarity index 100%
rename from projects/plugins/mu-wpcom-plugin/changelog/renovate-lock-file-maintenance#4
rename to projects/plugins/protect/changelog/renovate-lock-file-maintenance#4
diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock
index 920a59e6563a4..0524ad3fe45be 100644
--- a/projects/plugins/protect/composer.lock
+++ b/projects/plugins/protect/composer.lock
@@ -1732,7 +1732,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "ece2cb5be16c8bc399fb6681a61ffa42b42e3cf5"
+ "reference": "9f24b0cb0912e1e3f235e946b9f397ffd9e36ccf"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -1765,7 +1765,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "4.2.x-dev"
+ "dev-trunk": "4.3.x-dev"
},
"dependencies": {
"test-only": [
@@ -1810,7 +1810,7 @@
"dist": {
"type": "path",
"url": "../../packages/transport-helper",
- "reference": "4353e72d5e1254cfd1f61e4cd2b81e415550c841"
+ "reference": "6ff89ede12aa404b60a18318b84eb8425f1d2352"
},
"require": {
"automattic/jetpack-backup-helper-script-manager": "@dev",
@@ -1836,7 +1836,7 @@
},
"autotagger": true,
"branch-alias": {
- "dev-trunk": "0.2.x-dev"
+ "dev-trunk": "0.3.x-dev"
},
"textdomain": "jetpack-transport-helper"
},
@@ -2260,16 +2260,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.1",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
"shasum": ""
},
"require": {
@@ -2312,9 +2312,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
},
- "time": "2024-10-08T18:51:32+00:00"
+ "time": "2024-12-30T11:07:19+00:00"
},
{
"name": "phar-io/manifest",
@@ -4058,16 +4058,16 @@
},
{
"name": "symfony/console",
- "version": "v7.2.0",
+ "version": "v7.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf"
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
+ "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
"shasum": ""
},
"require": {
@@ -4131,7 +4131,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.2.0"
+ "source": "https://github.com/symfony/console/tree/v7.2.1"
},
"funding": [
{
@@ -4147,7 +4147,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-06T14:24:19+00:00"
+ "time": "2024-12-11T03:49:26+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -4168,12 +4168,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4480,8 +4480,8 @@
"type": "library",
"extra": {
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -4619,12 +4619,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4817,16 +4817,16 @@
},
{
"name": "yoast/phpunit-polyfills",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be"
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
+ "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
"shasum": ""
},
"require": {
@@ -4876,7 +4876,7 @@
"security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
"source": "https://github.com/Yoast/PHPUnit-Polyfills"
},
- "time": "2024-09-06T22:03:10+00:00"
+ "time": "2025-01-08T16:58:34+00:00"
}
],
"aliases": [],
diff --git a/projects/plugins/search/CHANGELOG.md b/projects/plugins/search/CHANGELOG.md
index 3413d46a5abe4..4fa4eb275d737 100644
--- a/projects/plugins/search/CHANGELOG.md
+++ b/projects/plugins/search/CHANGELOG.md
@@ -5,6 +5,31 @@ 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).
+## [4.0.0] - 2025-01-10
+### Added
+- Enable test coverage. [#39961]
+- My Jetpack: Update recommendations section in My Jetpack to include a slider interaction for the cards. [#39850]
+- Search: Added ability to customize results. [#36378]
+
+### Changed
+- Classic Widget: Update asset enqueuing strategy to ensure compatibility with the Elementor plugin. [#39820]
+- General: Indicate compatibility with the upcoming version of WordPress - 6.7. [#39786]
+- Include `wp-polyfill` as a script dependency only when needed. [#39629]
+- Resolve an issue where revoked licenses were incorrectly treated as unattached. This caused users to be redirected to the license activation page after site connection, even when unattached licenses were not valid for activation. [#40215]
+- Social: Changed My Jetpack CTA for Social from "Learn more" to "Activate" [#40359]
+- Updated dependencies. [#40286]
+- Updated package dependencies. [#39288] [#39653] [#40116] [#40515] [#40693] [#40815]
+
+### Removed
+- Connection: Removed deprecated `features_available` method. [#39442]
+- Connection: Removed deprecated `features_enabled` method. [#39475]
+- General: Update minimum PHP version to 7.2. [#40147]
+- General: Update minimum WordPress version to 6.6. [#40146]
+
+### Fixed
+- E2E Tests: Only install single browser used by Playwright. [#40827]
+- My Jetpack: Update GlobalNotice component to look better on mobile. [#39537]
+
## [3.0.1] - 2024-09-06
### Changed
- Internal updates.
@@ -149,6 +174,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
[1.1.0-beta]: https://github.com/Automattic/jetpack-search-plugin/compare/1.0.0...1.1.0-beta
[1.2.0-beta]: https://github.com/Automattic/jetpack-search-plugin/compare/1.1.0...1.2.0-beta
+[4.0.0]: https://github.com/Automattic/jetpack-search-plugin/compare/3.0.1...4.0.0
[3.0.1]: https://github.com/Automattic/jetpack-search-plugin/compare/3.0.0...3.0.1
[3.0.0]: https://github.com/Automattic/jetpack-search-plugin/compare/2.1.0...3.0.0
[2.1.0]: https://github.com/Automattic/jetpack-search-plugin/compare/2.0.0...2.1.0
diff --git a/projects/plugins/search/changelog/add-ci-always-process-coverage b/projects/plugins/search/changelog/add-ci-always-process-coverage
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/add-ci-always-process-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/add-dependency-extraction-auto-polyfill b/projects/plugins/search/changelog/add-dependency-extraction-auto-polyfill
deleted file mode 100644
index f4cd286e166af..0000000000000
--- a/projects/plugins/search/changelog/add-dependency-extraction-auto-polyfill
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Only include `wp-polyfill` as a script dependency when needed.
diff --git a/projects/plugins/search/changelog/add-features-enabled-rest-endpoint b/projects/plugins/search/changelog/add-features-enabled-rest-endpoint
deleted file mode 100644
index 57cf25c290a35..0000000000000
--- a/projects/plugins/search/changelog/add-features-enabled-rest-endpoint
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: removed
-
-Connection: Removed features_enabled deprecated method
diff --git a/projects/plugins/search/changelog/add-jetpack-search-custom-results b/projects/plugins/search/changelog/add-jetpack-search-custom-results
deleted file mode 100644
index a9875522e2ff6..0000000000000
--- a/projects/plugins/search/changelog/add-jetpack-search-custom-results
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Search: Added ability to customize results
diff --git a/projects/plugins/search/changelog/add-my-jetpack-recommendations-slider b/projects/plugins/search/changelog/add-my-jetpack-recommendations-slider
deleted file mode 100644
index 0658a74e13790..0000000000000
--- a/projects/plugins/search/changelog/add-my-jetpack-recommendations-slider
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-My Jetpack: update the recommendations section in My Jetpack to include a slider interaction for the cards.
diff --git a/projects/plugins/search/changelog/add-restful-features-available b/projects/plugins/search/changelog/add-restful-features-available
deleted file mode 100644
index 152ef1efc4b7f..0000000000000
--- a/projects/plugins/search/changelog/add-restful-features-available
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: removed
-
-Connection: Removed deprecated method features_available
diff --git a/projects/plugins/search/changelog/fix-bump_composer_versions b/projects/plugins/search/changelog/fix-bump_composer_versions
deleted file mode 100644
index 13cbf3392f78d..0000000000000
--- a/projects/plugins/search/changelog/fix-bump_composer_versions
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated dependencies.
diff --git a/projects/plugins/search/changelog/fix-bump_composer_versions_round2#2 b/projects/plugins/search/changelog/fix-bump_composer_versions_round2#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/fix-bump_composer_versions_round2#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/fix-playwright_install_tweaks b/projects/plugins/search/changelog/fix-playwright_install_tweaks
deleted file mode 100644
index ebeba9b69f473..0000000000000
--- a/projects/plugins/search/changelog/fix-playwright_install_tweaks
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-E2E Tests: Only install single browser used by Playwright.
diff --git a/projects/plugins/search/changelog/fix-sync-filter-null-array b/projects/plugins/search/changelog/fix-sync-filter-null-array
deleted file mode 100644
index 3f56c90b3a7bf..0000000000000
--- a/projects/plugins/search/changelog/fix-sync-filter-null-array
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Sync: update filter parameter to avoid conflicts with other plugins.
-
-
diff --git a/projects/plugins/search/changelog/prerelease b/projects/plugins/search/changelog/prerelease
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/prerelease
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/prerelease#10 b/projects/plugins/search/changelog/prerelease#10
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/prerelease#10
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/prerelease#11 b/projects/plugins/search/changelog/prerelease#11
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/prerelease#11
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/prerelease#15 b/projects/plugins/search/changelog/prerelease#15
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/prerelease#15
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/prerelease#16 b/projects/plugins/search/changelog/prerelease#16
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/prerelease#16
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/prerelease#17 b/projects/plugins/search/changelog/prerelease#17
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/prerelease#17
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/prerelease#18 b/projects/plugins/search/changelog/prerelease#18
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/prerelease#18
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/prerelease#19 b/projects/plugins/search/changelog/prerelease#19
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/prerelease#19
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/prerelease#2 b/projects/plugins/search/changelog/prerelease#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/prerelease#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/prerelease#3 b/projects/plugins/search/changelog/prerelease#3
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/prerelease#3
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/prerelease#4 b/projects/plugins/search/changelog/prerelease#4
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/prerelease#4
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/prerelease#5 b/projects/plugins/search/changelog/prerelease#5
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/prerelease#5
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/prerelease#6 b/projects/plugins/search/changelog/prerelease#6
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/prerelease#6
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/prerelease#7 b/projects/plugins/search/changelog/prerelease#7
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/prerelease#7
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/prerelease#8 b/projects/plugins/search/changelog/prerelease#8
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/prerelease#8
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/prerelease#9 b/projects/plugins/search/changelog/prerelease#9
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/prerelease#9
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/renovate-brain-monkey-2.x b/projects/plugins/search/changelog/renovate-brain-monkey-2.x
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/renovate-brain-monkey-2.x
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/renovate-config-3.x b/projects/plugins/search/changelog/renovate-config-3.x
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/search/changelog/renovate-config-3.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/search/changelog/renovate-lock-file-maintenance#3 b/projects/plugins/search/changelog/renovate-lock-file-maintenance#3
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/renovate-lock-file-maintenance#3
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/renovate-lock-file-maintenance#4 b/projects/plugins/search/changelog/renovate-lock-file-maintenance#4
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/search/changelog/renovate-lock-file-maintenance#4
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/search/changelog/renovate-lock-file-maintenance#5 b/projects/plugins/search/changelog/renovate-lock-file-maintenance#5
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/renovate-lock-file-maintenance#5
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/renovate-lock-file-maintenance#6 b/projects/plugins/search/changelog/renovate-lock-file-maintenance#6
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/search/changelog/renovate-lock-file-maintenance#6
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/search/changelog/renovate-playwright-monorepo b/projects/plugins/search/changelog/renovate-playwright-monorepo
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/search/changelog/renovate-playwright-monorepo
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/search/changelog/restore-jp_test_coverage b/projects/plugins/search/changelog/restore-jp_test_coverage
deleted file mode 100644
index 7bb19dc79dd19..0000000000000
--- a/projects/plugins/search/changelog/restore-jp_test_coverage
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Enable test coverage.
diff --git a/projects/plugins/search/changelog/restore-jp_test_coverage#2 b/projects/plugins/search/changelog/restore-jp_test_coverage#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/restore-jp_test_coverage#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/update-bump_min_php_to_7.2 b/projects/plugins/search/changelog/update-bump_min_php_to_7.2
deleted file mode 100644
index 712ab5f494aaa..0000000000000
--- a/projects/plugins/search/changelog/update-bump_min_php_to_7.2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: major
-Type: removed
-
-General: Update minimum PHP version to 7.2.
diff --git a/projects/plugins/search/changelog/update-bump_min_php_to_7.2#2 b/projects/plugins/search/changelog/update-bump_min_php_to_7.2#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/update-bump_min_php_to_7.2#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/update-bump_min_wp_to_6.6 b/projects/plugins/search/changelog/update-bump_min_wp_to_6.6
deleted file mode 100644
index b5daa14e55bc4..0000000000000
--- a/projects/plugins/search/changelog/update-bump_min_wp_to_6.6
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: major
-Type: removed
-
-General: Update minimum WordPress version to 6.6.
diff --git a/projects/plugins/search/changelog/update-composer b/projects/plugins/search/changelog/update-composer
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/search/changelog/update-composer
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/search/changelog/update-eslint-9 b/projects/plugins/search/changelog/update-eslint-9
deleted file mode 100644
index 1cb10572ab69e..0000000000000
--- a/projects/plugins/search/changelog/update-eslint-9
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Update eslint config for eslint 9.
-
-
diff --git a/projects/plugins/search/changelog/update-fetch-available-licenses b/projects/plugins/search/changelog/update-fetch-available-licenses
deleted file mode 100644
index 3c349c8b1445e..0000000000000
--- a/projects/plugins/search/changelog/update-fetch-available-licenses
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Resolved an issue where revoked licenses were incorrectly treated as unattached. This caused users to be redirected to the license activation page after site connection, even when unattached licenses were not valid for activation.
diff --git a/projects/plugins/search/changelog/update-my-jetpack-notice-mobile-style b/projects/plugins/search/changelog/update-my-jetpack-notice-mobile-style
deleted file mode 100644
index c740afea846ef..0000000000000
--- a/projects/plugins/search/changelog/update-my-jetpack-notice-mobile-style
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-My Jetpack: visual update to the GlobalNotice component look better on mobile.
diff --git a/projects/plugins/search/changelog/update-my-jetpack-social-cta b/projects/plugins/search/changelog/update-my-jetpack-social-cta
deleted file mode 100644
index 6b1daf9c1b05e..0000000000000
--- a/projects/plugins/search/changelog/update-my-jetpack-social-cta
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Social | Changed My Jetpack CTA for Social from "Learn more" to "Activate"
diff --git a/projects/plugins/search/changelog/update-switch-to-raw-coverage-files b/projects/plugins/search/changelog/update-switch-to-raw-coverage-files
deleted file mode 100644
index bfd48f31ebc60..0000000000000
--- a/projects/plugins/search/changelog/update-switch-to-raw-coverage-files
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Generate raw phpunit and/or jest coverage data instead of clover.
-
-
diff --git a/projects/plugins/search/changelog/update-tested-to-6-7 b/projects/plugins/search/changelog/update-tested-to-6-7
deleted file mode 100644
index 9c1d5b4fabb5f..0000000000000
--- a/projects/plugins/search/changelog/update-tested-to-6-7
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-General: indicate compatibility with the upcoming version of WordPress - 6.7.
diff --git a/projects/plugins/search/changelog/update-widgets-enqueuing-strategy b/projects/plugins/search/changelog/update-widgets-enqueuing-strategy
deleted file mode 100644
index 69a55655c5ca9..0000000000000
--- a/projects/plugins/search/changelog/update-widgets-enqueuing-strategy
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Classic Widget: update assets' enqueuing strategy to ensure compatibility with the Elementor plugin.
diff --git a/projects/plugins/search/composer.json b/projects/plugins/search/composer.json
index f337f2c557322..6b36aaef99309 100644
--- a/projects/plugins/search/composer.json
+++ b/projects/plugins/search/composer.json
@@ -65,7 +65,7 @@
},
"config": {
"sort-packages": true,
- "autoloader-suffix": "b462338fb66be23595d68a93345c9e3d_jetpack_searchⓥ3_0_1",
+ "autoloader-suffix": "b462338fb66be23595d68a93345c9e3d_jetpack_searchⓥ4_0_0",
"allow-plugins": {
"automattic/jetpack-autoloader": true,
"automattic/jetpack-composer-plugin": true,
diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock
index 65e3147ffcde3..f32044e497c6b 100644
--- a/projects/plugins/search/composer.lock
+++ b/projects/plugins/search/composer.lock
@@ -1827,7 +1827,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "ece2cb5be16c8bc399fb6681a61ffa42b42e3cf5"
+ "reference": "9f24b0cb0912e1e3f235e946b9f397ffd9e36ccf"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -1860,7 +1860,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "4.2.x-dev"
+ "dev-trunk": "4.3.x-dev"
},
"dependencies": {
"test-only": [
@@ -2110,16 +2110,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.1",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
"shasum": ""
},
"require": {
@@ -2162,9 +2162,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
},
- "time": "2024-10-08T18:51:32+00:00"
+ "time": "2024-12-30T11:07:19+00:00"
},
{
"name": "phar-io/manifest",
@@ -3724,16 +3724,16 @@
},
{
"name": "symfony/console",
- "version": "v7.2.0",
+ "version": "v7.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf"
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
+ "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
"shasum": ""
},
"require": {
@@ -3797,7 +3797,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.2.0"
+ "source": "https://github.com/symfony/console/tree/v7.2.1"
},
"funding": [
{
@@ -3813,7 +3813,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-06T14:24:19+00:00"
+ "time": "2024-12-11T03:49:26+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -3834,12 +3834,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4146,8 +4146,8 @@
"type": "library",
"extra": {
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -4285,12 +4285,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4483,16 +4483,16 @@
},
{
"name": "yoast/phpunit-polyfills",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be"
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
+ "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
"shasum": ""
},
"require": {
@@ -4542,7 +4542,7 @@
"security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
"source": "https://github.com/Yoast/PHPUnit-Polyfills"
},
- "time": "2024-09-06T22:03:10+00:00"
+ "time": "2025-01-08T16:58:34+00:00"
}
],
"aliases": [],
diff --git a/projects/plugins/search/jetpack-search.php b/projects/plugins/search/jetpack-search.php
index 53b82104dd200..39418fe18f7b9 100644
--- a/projects/plugins/search/jetpack-search.php
+++ b/projects/plugins/search/jetpack-search.php
@@ -4,7 +4,7 @@
* Plugin Name: Jetpack Search
* Plugin URI: https://jetpack.com/search/
* Description: Easily add cloud-powered instant search and filters to your website or WooCommerce store with advanced algorithms that boost your search results based on traffic to your site.
- * Version: 3.0.1
+ * Version: 4.0.0
* Author: Automattic - Jetpack Search team
* Author URI: https://jetpack.com/
* License: GPLv2 or later
@@ -26,7 +26,7 @@
define( 'JETPACK_SEARCH_PLUGIN__FILE', __FILE__ );
define( 'JETPACK_SEARCH_PLUGIN__FILE_RELATIVE_PATH', plugin_basename( __FILE__ ) );
define( 'JETPACK_SEARCH_PLUGIN__SLUG', 'jetpack-search' );
-define( 'JETPACK_SEARCH_PLUGIN__VERSION', '3.0.1' );
+define( 'JETPACK_SEARCH_PLUGIN__VERSION', '4.0.0' );
defined( 'JETPACK_CLIENT__AUTH_LOCATION' ) || define( 'JETPACK_CLIENT__AUTH_LOCATION', 'header' );
defined( 'JETPACK__API_BASE' ) || define( 'JETPACK__API_BASE', 'https://jetpack.wordpress.com/jetpack.' );
diff --git a/projects/plugins/search/readme.txt b/projects/plugins/search/readme.txt
index 2041c4a205ff8..888cacfbb0279 100644
--- a/projects/plugins/search/readme.txt
+++ b/projects/plugins/search/readme.txt
@@ -122,9 +122,30 @@ If you are using the Jetpack Search free option, and you have more than 5000 rec
5. Manage all of your Jetpack products, including Search, in a single place.
== Changelog ==
-### 3.0.1 - 2024-09-06
+### 4.0.0 - 2025-01-10
+#### Added
+- Enable test coverage.
+- My Jetpack: Update recommendations section in My Jetpack to include a slider interaction for the cards.
+- Search: Added ability to customize results.
+
#### Changed
-- Internal updates.
+- Classic Widget: Update asset enqueuing strategy to ensure compatibility with the Elementor plugin.
+- General: Indicate compatibility with the upcoming version of WordPress - 6.7.
+- Include `wp-polyfill` as a script dependency only when needed.
+- Resolve an issue where revoked licenses were incorrectly treated as unattached. This caused users to be redirected to the license activation page after site connection, even when unattached licenses were not valid for activation.
+- Social: Changed My Jetpack CTA for Social from "Learn more" to "Activate"
+- Updated dependencies.
+- Updated package dependencies.
+
+#### Removed
+- Connection: Removed deprecated `features_available` method.
+- Connection: Removed deprecated `features_enabled` method.
+- General: Update minimum PHP version to 7.2.
+- General: Update minimum WordPress version to 6.6.
+
+#### Fixed
+- E2E Tests: Only install single browser used by Playwright.
+- My Jetpack: Update GlobalNotice component to look better on mobile.
== Testimonials ==
diff --git a/projects/plugins/social/CHANGELOG.md b/projects/plugins/social/CHANGELOG.md
index 98da7ce7bca7f..8092d19e46b9a 100644
--- a/projects/plugins/social/CHANGELOG.md
+++ b/projects/plugins/social/CHANGELOG.md
@@ -5,6 +5,44 @@ 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).
+## 6.0.0 - 2025-01-14
+### Added
+- Add Bluesky to social feature copy. [#40487]
+- Add a new toggle for UTM tracking. [#39998]
+- Add LinkedIn permissions warning. [#40220]
+- Enable test coverage. [#39961]
+- Make Post share status immediately available in the editor on page load. [#40301]
+- My Jetpack: Update recommendations section in My Jetpack to include a slider interaction for the cards. [#39850]
+
+### Changed
+- Change My Jetpack CTA from "Learn more" to "Activate". [#40359]
+- Change order of connections. [#40020]
+- Clean up unused TypeScript types [#40033]
+- E2E Tests: Update tests to use @wordpress/e2e-test-utils-playwright. [#40750]
+- Ensure the support link points to Jetpack support. [#40760]
+- Image Generator: Change description for toggle. [#40991]
+- Image Generator: Move settings to new store. [#39904]
+- Migrate settings to new script data. [#40032]
+- Migrate the last bits of social store to new script data. [#40081]
+- Move the admin menu initialization to the init hook. [#40474]
+- Readme: Update documentation to include all supported social networks. [#40248]
+- Remove some unused code. [#40122]
+- Resolve an issue where revoked licenses were incorrectly treated as unattached. This caused users to be redirected to the license activation page after site connection, even when unattached licenses were not valid for activation. [#40215]
+- Updated dependencies. [#40286]
+- Updated package dependencies. [#39999] [#40000] [#40060] [#40116] [#40258] [#40288] [#40363] [#40515] [#40564] [#40693] [#40784] [#40792] [#40798] [#40815] [#40980]
+
+### Removed
+- General: Update minimum PHP version to 7.2. [#40147]
+- General: Update minimum WordPress version to 6.6. [#40146]
+
+### Fixed
+- E2E Tests: Only install single browser used by Playwright. [#40827]
+- Fix an issue where we showed the license message even with a plan. [#40931]
+- Fix the infinite reload issue on Jetpack Sharing settings. [#40089]
+- Fix the Instagram max video length. [#39930]
+- Page & Post: Fix the layout on mobile when details are open. [#40872]
+- Prevent dataviews styles imported in share status from being added globally. [#39991]
+
## 5.5.1 - 2024-10-29
### Changed
- Components: Add __nextHasNoMarginBottom to BaseControl-based components, preventing deprecation notices. [#39877]
diff --git a/projects/plugins/social/changelog/add-bluesky-to-social-network-feature-copy b/projects/plugins/social/changelog/add-bluesky-to-social-network-feature-copy
deleted file mode 100644
index 66ad74185bb3a..0000000000000
--- a/projects/plugins/social/changelog/add-bluesky-to-social-network-feature-copy
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Add Bluesky to social feature copy
diff --git a/projects/plugins/social/changelog/add-ci-always-process-coverage b/projects/plugins/social/changelog/add-ci-always-process-coverage
deleted file mode 100644
index 387ca599c4182..0000000000000
--- a/projects/plugins/social/changelog/add-ci-always-process-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Always run JS coverage, even if PHP coverage fails.
-
-
diff --git a/projects/plugins/social/changelog/add-e2e-test-for-publicize-activation-from-the-editor b/projects/plugins/social/changelog/add-e2e-test-for-publicize-activation-from-the-editor
deleted file mode 100644
index 5af1c99a84770..0000000000000
--- a/projects/plugins/social/changelog/add-e2e-test-for-publicize-activation-from-the-editor
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated E2E test
-
-
diff --git a/projects/plugins/social/changelog/add-linkedin-warning b/projects/plugins/social/changelog/add-linkedin-warning
deleted file mode 100644
index ab211a2d6f602..0000000000000
--- a/projects/plugins/social/changelog/add-linkedin-warning
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Added linkedin warning
diff --git a/projects/plugins/social/changelog/add-my-jetpack-recommendations-slider b/projects/plugins/social/changelog/add-my-jetpack-recommendations-slider
deleted file mode 100644
index 0658a74e13790..0000000000000
--- a/projects/plugins/social/changelog/add-my-jetpack-recommendations-slider
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-My Jetpack: update the recommendations section in My Jetpack to include a slider interaction for the cards.
diff --git a/projects/plugins/social/changelog/add-social-utm-toggle b/projects/plugins/social/changelog/add-social-utm-toggle
deleted file mode 100644
index 051cef8fb332c..0000000000000
--- a/projects/plugins/social/changelog/add-social-utm-toggle
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-Added a new toggle for UTM tracking
diff --git a/projects/plugins/social/changelog/explore-wp-e2e-setup b/projects/plugins/social/changelog/explore-wp-e2e-setup
deleted file mode 100644
index 31a7d1fe4b51b..0000000000000
--- a/projects/plugins/social/changelog/explore-wp-e2e-setup
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated E2E tests to use @wordpress/e2e-test-utils-playwright
diff --git a/projects/plugins/social/changelog/fix-bump_composer_versions b/projects/plugins/social/changelog/fix-bump_composer_versions
deleted file mode 100644
index 13cbf3392f78d..0000000000000
--- a/projects/plugins/social/changelog/fix-bump_composer_versions
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated dependencies.
diff --git a/projects/plugins/social/changelog/fix-bump_composer_versions_round2#2 b/projects/plugins/social/changelog/fix-bump_composer_versions_round2#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/fix-bump_composer_versions_round2#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/fix-instagram-video-length b/projects/plugins/social/changelog/fix-instagram-video-length
deleted file mode 100644
index 184b7ae44f3e6..0000000000000
--- a/projects/plugins/social/changelog/fix-instagram-video-length
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Social: Fixed the Instagram max video length
diff --git a/projects/plugins/social/changelog/fix-playwright_install_tweaks b/projects/plugins/social/changelog/fix-playwright_install_tweaks
deleted file mode 100644
index ebeba9b69f473..0000000000000
--- a/projects/plugins/social/changelog/fix-playwright_install_tweaks
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-E2E Tests: Only install single browser used by Playwright.
diff --git a/projects/plugins/social/changelog/fix-social-dataviews-styles-being-added-globally b/projects/plugins/social/changelog/fix-social-dataviews-styles-being-added-globally
deleted file mode 100644
index 31d9c15df3a10..0000000000000
--- a/projects/plugins/social/changelog/fix-social-dataviews-styles-being-added-globally
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Fixed dataviews styles imported in share status being added globally
diff --git a/projects/plugins/social/changelog/fix-social-infinite-reload-of-jetpack-settings-page b/projects/plugins/social/changelog/fix-social-infinite-reload-of-jetpack-settings-page
deleted file mode 100644
index b53d86b6e5a94..0000000000000
--- a/projects/plugins/social/changelog/fix-social-infinite-reload-of-jetpack-settings-page
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Fixed the inifite reload issue on Jetpack Sharing settings
diff --git a/projects/plugins/social/changelog/move-admin-menu-to-init b/projects/plugins/social/changelog/move-admin-menu-to-init
deleted file mode 100644
index c08dcf087a023..0000000000000
--- a/projects/plugins/social/changelog/move-admin-menu-to-init
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: changed
-
-Moved the admin menu initialization to the init hook.
diff --git a/projects/plugins/social/changelog/prerelease b/projects/plugins/social/changelog/prerelease
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/prerelease
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/prerelease#10 b/projects/plugins/social/changelog/prerelease#10
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/prerelease#10
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/prerelease#11 b/projects/plugins/social/changelog/prerelease#11
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/prerelease#11
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/prerelease#2 b/projects/plugins/social/changelog/prerelease#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/prerelease#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/prerelease#3 b/projects/plugins/social/changelog/prerelease#3
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/prerelease#3
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/prerelease#4 b/projects/plugins/social/changelog/prerelease#4
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/prerelease#4
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/prerelease#5 b/projects/plugins/social/changelog/prerelease#5
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/prerelease#5
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/prerelease#6 b/projects/plugins/social/changelog/prerelease#6
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/prerelease#6
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/prerelease#7 b/projects/plugins/social/changelog/prerelease#7
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/prerelease#7
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/prerelease#8 b/projects/plugins/social/changelog/prerelease#8
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/prerelease#8
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/prerelease#9 b/projects/plugins/social/changelog/prerelease#9
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/prerelease#9
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/renovate-automattic-color-studio-4.x b/projects/plugins/social/changelog/renovate-automattic-color-studio-4.x
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/social/changelog/renovate-automattic-color-studio-4.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/social/changelog/renovate-autoprefixer-10.x b/projects/plugins/social/changelog/renovate-autoprefixer-10.x
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/social/changelog/renovate-autoprefixer-10.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/social/changelog/renovate-babel-monorepo b/projects/plugins/social/changelog/renovate-babel-monorepo
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/social/changelog/renovate-babel-monorepo
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/social/changelog/renovate-brain-monkey-2.x b/projects/plugins/social/changelog/renovate-brain-monkey-2.x
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/social/changelog/renovate-brain-monkey-2.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/social/changelog/renovate-brain-monkey-2.x#2 b/projects/plugins/social/changelog/renovate-brain-monkey-2.x#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/renovate-brain-monkey-2.x#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/renovate-config-3.x b/projects/plugins/social/changelog/renovate-config-3.x
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/social/changelog/renovate-config-3.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/social/changelog/renovate-definitelytyped b/projects/plugins/social/changelog/renovate-definitelytyped
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/social/changelog/renovate-definitelytyped
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/social/changelog/renovate-definitelytyped#2 b/projects/plugins/social/changelog/renovate-definitelytyped#2
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/social/changelog/renovate-definitelytyped#2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/social/changelog/renovate-lock-file-maintenance#2 b/projects/plugins/social/changelog/renovate-lock-file-maintenance#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/renovate-lock-file-maintenance#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/renovate-lock-file-maintenance#3 b/projects/plugins/social/changelog/renovate-lock-file-maintenance#3
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/social/changelog/renovate-lock-file-maintenance#3
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/social/changelog/renovate-playwright-monorepo b/projects/plugins/social/changelog/renovate-playwright-monorepo
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/social/changelog/renovate-playwright-monorepo
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/social/changelog/renovate-wordpress-monorepo b/projects/plugins/social/changelog/renovate-wordpress-monorepo
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/social/changelog/renovate-wordpress-monorepo
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/social/changelog/renovate-wordpress-monorepo#2 b/projects/plugins/social/changelog/renovate-wordpress-monorepo#2
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/social/changelog/renovate-wordpress-monorepo#2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/social/changelog/renovate-wordpress-monorepo#3 b/projects/plugins/social/changelog/renovate-wordpress-monorepo#3
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/social/changelog/renovate-wordpress-monorepo#3
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/social/changelog/renovate-wordpress-monorepo#4 b/projects/plugins/social/changelog/renovate-wordpress-monorepo#4
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/social/changelog/renovate-wordpress-monorepo#4
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/social/changelog/restore-jp_test_coverage b/projects/plugins/social/changelog/restore-jp_test_coverage
deleted file mode 100644
index 7bb19dc79dd19..0000000000000
--- a/projects/plugins/social/changelog/restore-jp_test_coverage
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Enable test coverage.
diff --git a/projects/plugins/social/changelog/restore-jp_test_coverage#2 b/projects/plugins/social/changelog/restore-jp_test_coverage#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/restore-jp_test_coverage#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/update-bump_min_php_to_7.2 b/projects/plugins/social/changelog/update-bump_min_php_to_7.2
deleted file mode 100644
index 712ab5f494aaa..0000000000000
--- a/projects/plugins/social/changelog/update-bump_min_php_to_7.2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: major
-Type: removed
-
-General: Update minimum PHP version to 7.2.
diff --git a/projects/plugins/social/changelog/update-bump_min_php_to_7.2#2 b/projects/plugins/social/changelog/update-bump_min_php_to_7.2#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/update-bump_min_php_to_7.2#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/update-bump_min_wp_to_6.6 b/projects/plugins/social/changelog/update-bump_min_wp_to_6.6
deleted file mode 100644
index b5daa14e55bc4..0000000000000
--- a/projects/plugins/social/changelog/update-bump_min_wp_to_6.6
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: major
-Type: removed
-
-General: Update minimum WordPress version to 6.6.
diff --git a/projects/plugins/social/changelog/update-clean-up-social-store b/projects/plugins/social/changelog/update-clean-up-social-store
deleted file mode 100644
index ee4b7c29db3ec..0000000000000
--- a/projects/plugins/social/changelog/update-clean-up-social-store
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Clean up unused TS types
diff --git a/projects/plugins/social/changelog/update-composer b/projects/plugins/social/changelog/update-composer
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/update-composer
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/update-eslint-9 b/projects/plugins/social/changelog/update-eslint-9
deleted file mode 100644
index 1cb10572ab69e..0000000000000
--- a/projects/plugins/social/changelog/update-eslint-9
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Update eslint config for eslint 9.
-
-
diff --git a/projects/plugins/social/changelog/update-fetch-available-licenses b/projects/plugins/social/changelog/update-fetch-available-licenses
deleted file mode 100644
index 3c349c8b1445e..0000000000000
--- a/projects/plugins/social/changelog/update-fetch-available-licenses
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Resolved an issue where revoked licenses were incorrectly treated as unattached. This caused users to be redirected to the license activation page after site connection, even when unattached licenses were not valid for activation.
diff --git a/projects/plugins/social/changelog/update-migrate-sid-settings-to-new-store b/projects/plugins/social/changelog/update-migrate-sid-settings-to-new-store
deleted file mode 100644
index 0e7734a13ccc9..0000000000000
--- a/projects/plugins/social/changelog/update-migrate-sid-settings-to-new-store
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Social: Migrated Social Image Generator settings to new store
diff --git a/projects/plugins/social/changelog/update-migrate-social-settings-to-script-data b/projects/plugins/social/changelog/update-migrate-social-settings-to-script-data
deleted file mode 100644
index 61945dc9fa213..0000000000000
--- a/projects/plugins/social/changelog/update-migrate-social-settings-to-script-data
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Migrated social plugins settings to new script data
diff --git a/projects/plugins/social/changelog/update-my-jetpack-social-cta b/projects/plugins/social/changelog/update-my-jetpack-social-cta
deleted file mode 100644
index 6b1daf9c1b05e..0000000000000
--- a/projects/plugins/social/changelog/update-my-jetpack-social-cta
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Social | Changed My Jetpack CTA for Social from "Learn more" to "Activate"
diff --git a/projects/plugins/social/changelog/update-publicize-bluesky-docs b/projects/plugins/social/changelog/update-publicize-bluesky-docs
deleted file mode 100644
index b6fd38efb57b6..0000000000000
--- a/projects/plugins/social/changelog/update-publicize-bluesky-docs
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Readme: update documentation to mention all the social networks we support, including the newer ones.
diff --git a/projects/plugins/social/changelog/update-remove-unused-code-for-social b/projects/plugins/social/changelog/update-remove-unused-code-for-social
deleted file mode 100644
index e47ab386b1029..0000000000000
--- a/projects/plugins/social/changelog/update-remove-unused-code-for-social
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Removed some unused code for Social
diff --git a/projects/plugins/social/changelog/update-social-load-share-status-from-initial-state b/projects/plugins/social/changelog/update-social-load-share-status-from-initial-state
deleted file mode 100644
index f140482c62ff4..0000000000000
--- a/projects/plugins/social/changelog/update-social-load-share-status-from-initial-state
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Post share status in the editor is now immediately available on page load
diff --git a/projects/plugins/social/changelog/update-social-migrate-remaining-settings-to-script-data b/projects/plugins/social/changelog/update-social-migrate-remaining-settings-to-script-data
deleted file mode 100644
index b913e50e3eb88..0000000000000
--- a/projects/plugins/social/changelog/update-social-migrate-remaining-settings-to-script-data
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Social: Migrated the last bits of social store to new script data
diff --git a/projects/plugins/social/changelog/update-social-support-link b/projects/plugins/social/changelog/update-social-support-link
deleted file mode 100644
index 4722e55a82b35..0000000000000
--- a/projects/plugins/social/changelog/update-social-support-link
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Social admin page: Ensure the support link points to Jetpack support
diff --git a/projects/plugins/social/changelog/update-switch-to-raw-coverage-files b/projects/plugins/social/changelog/update-switch-to-raw-coverage-files
deleted file mode 100644
index bfd48f31ebc60..0000000000000
--- a/projects/plugins/social/changelog/update-switch-to-raw-coverage-files
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Generate raw phpunit and/or jest coverage data instead of clover.
-
-
diff --git a/projects/plugins/social/composer.json b/projects/plugins/social/composer.json
index 1fe12e483291f..2de73727dd9cd 100644
--- a/projects/plugins/social/composer.json
+++ b/projects/plugins/social/composer.json
@@ -85,6 +85,6 @@
"automattic/jetpack-autoloader": true,
"automattic/jetpack-composer-plugin": true
},
- "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_socialⓥ5_5_1"
+ "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_socialⓥ6_0_0"
}
}
diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock
index d703c4a28382e..fc6251abb2b38 100644
--- a/projects/plugins/social/composer.lock
+++ b/projects/plugins/social/composer.lock
@@ -1819,7 +1819,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "ece2cb5be16c8bc399fb6681a61ffa42b42e3cf5"
+ "reference": "9f24b0cb0912e1e3f235e946b9f397ffd9e36ccf"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -1852,7 +1852,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "4.2.x-dev"
+ "dev-trunk": "4.3.x-dev"
},
"dependencies": {
"test-only": [
@@ -1895,16 +1895,16 @@
"packages-dev": [
{
"name": "antecedent/patchwork",
- "version": "2.2.0",
+ "version": "2.2.1",
"source": {
"type": "git",
"url": "https://github.com/antecedent/patchwork.git",
- "reference": "b07d4fb37c3c723c8755122160c089e077d5de65"
+ "reference": "1bf183a3e1bd094f231a2128b9ecc5363c269245"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/antecedent/patchwork/zipball/b07d4fb37c3c723c8755122160c089e077d5de65",
- "reference": "b07d4fb37c3c723c8755122160c089e077d5de65",
+ "url": "https://api.github.com/repos/antecedent/patchwork/zipball/1bf183a3e1bd094f231a2128b9ecc5363c269245",
+ "reference": "1bf183a3e1bd094f231a2128b9ecc5363c269245",
"shasum": ""
},
"require": {
@@ -1937,9 +1937,9 @@
],
"support": {
"issues": "https://github.com/antecedent/patchwork/issues",
- "source": "https://github.com/antecedent/patchwork/tree/2.2.0"
+ "source": "https://github.com/antecedent/patchwork/tree/2.2.1"
},
- "time": "2024-09-27T16:59:55+00:00"
+ "time": "2024-12-11T10:19:54+00:00"
},
{
"name": "automattic/jetpack-changelogger",
@@ -2399,16 +2399,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.1",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
"shasum": ""
},
"require": {
@@ -2451,9 +2451,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
},
- "time": "2024-10-08T18:51:32+00:00"
+ "time": "2024-12-30T11:07:19+00:00"
},
{
"name": "phar-io/manifest",
@@ -4197,16 +4197,16 @@
},
{
"name": "symfony/console",
- "version": "v7.2.0",
+ "version": "v7.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf"
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
+ "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
"shasum": ""
},
"require": {
@@ -4270,7 +4270,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.2.0"
+ "source": "https://github.com/symfony/console/tree/v7.2.1"
},
"funding": [
{
@@ -4286,7 +4286,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-06T14:24:19+00:00"
+ "time": "2024-12-11T03:49:26+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -4307,12 +4307,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4619,8 +4619,8 @@
"type": "library",
"extra": {
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -4758,12 +4758,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4956,16 +4956,16 @@
},
{
"name": "yoast/phpunit-polyfills",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be"
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
+ "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
"shasum": ""
},
"require": {
@@ -5015,7 +5015,7 @@
"security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
"source": "https://github.com/Yoast/PHPUnit-Polyfills"
},
- "time": "2024-09-06T22:03:10+00:00"
+ "time": "2025-01-08T16:58:34+00:00"
}
],
"aliases": [],
diff --git a/projects/plugins/social/jetpack-social.php b/projects/plugins/social/jetpack-social.php
index 6921cf0fcc4c9..28d374f9cce27 100644
--- a/projects/plugins/social/jetpack-social.php
+++ b/projects/plugins/social/jetpack-social.php
@@ -4,7 +4,7 @@
* Plugin Name: Jetpack Social
* Plugin URI: https://wordpress.org/plugins/jetpack-social
* Description: Share your site’s posts on several social media networks automatically when you publish a new post.
- * Version: 5.5.1
+ * Version: 6.0.0
* Author: Automattic - Jetpack Social team
* Author URI: https://jetpack.com/social/
* License: GPLv2 or later
diff --git a/projects/plugins/social/readme.txt b/projects/plugins/social/readme.txt
index e2a04fc20f2bf..d21d09fbe1043 100644
--- a/projects/plugins/social/readme.txt
+++ b/projects/plugins/social/readme.txt
@@ -104,11 +104,44 @@ The easiest way is to use the Custom Message option in the publishing options bo
6. Managing Social media accounts in the post editor
== Changelog ==
-### 5.5.1 - 2024-10-29
+### 6.0.0 - 2025-01-14
+#### Added
+- Add Bluesky to social feature copy.
+- Add a new toggle for UTM tracking.
+- Add LinkedIn permissions warning.
+- Enable test coverage.
+- Make Post share status immediately available in the editor on page load.
+- My Jetpack: Update recommendations section in My Jetpack to include a slider interaction for the cards.
+
#### Changed
-- Components: Add __nextHasNoMarginBottom to BaseControl-based components, preventing deprecation notices.
+- Change My Jetpack CTA from "Learn more" to "Activate".
+- Change order of connections.
+- Clean up unused TypeScript types
+- E2E Tests: Update tests to use @wordpress/e2e-test-utils-playwright.
+- Ensure the support link points to Jetpack support.
+- Image Generator: Change description for toggle.
+- Image Generator: Move settings to new store.
+- Migrate settings to new script data.
+- Migrate the last bits of social store to new script data.
+- Move the admin menu initialization to the init hook.
+- Readme: Update documentation to include all supported social networks.
+- Remove some unused code.
+- Resolve an issue where revoked licenses were incorrectly treated as unattached. This caused users to be redirected to the license activation page after site connection, even when unattached licenses were not valid for activation.
+- Updated dependencies.
- Updated package dependencies.
+#### Removed
+- General: Update minimum PHP version to 7.2.
+- General: Update minimum WordPress version to 6.6.
+
+#### Fixed
+- E2E Tests: Only install single browser used by Playwright.
+- Fix an issue where we showed the license message even with a plan.
+- Fix the infinite reload issue on Jetpack Sharing settings.
+- Fix the Instagram max video length.
+- Page & Post: Fix the layout on mobile when details are open.
+- Prevent dataviews styles imported in share status from being added globally.
+
== Upgrade Notice ==
= 3.0.0 =
diff --git a/projects/plugins/social/src/js/components/admin-page/header/index.jsx b/projects/plugins/social/src/js/components/admin-page/header/index.jsx
index 83ba6bc438f9d..31e52ebf1bd64 100644
--- a/projects/plugins/social/src/js/components/admin-page/header/index.jsx
+++ b/projects/plugins/social/src/js/components/admin-page/header/index.jsx
@@ -1,17 +1,11 @@
-import { store as socialStore } from '@automattic/jetpack-publicize-components';
+import { hasSocialPaidFeatures } from '@automattic/jetpack-publicize-components';
import { getMyJetpackUrl } from '@automattic/jetpack-script-data';
-import { useSelect } from '@wordpress/data';
import { createInterpolateElement } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
import Logo from './../../logo';
import styles from './styles.module.scss';
const AdminPageHeader = () => {
- const { showPricingPage } = useSelect( select => {
- return {
- showPricingPage: select( socialStore ).getSocialPluginSettings().show_pricing_page,
- };
- } );
const activateLicenseUrl = getMyJetpackUrl( '#/add-license' );
return (
@@ -20,7 +14,7 @@ const AdminPageHeader = () => {
- { showPricingPage && (
+ { ! hasSocialPaidFeatures() && (
{ createInterpolateElement(
__(
diff --git a/projects/plugins/social/src/js/components/social-image-generator-toggle/index.tsx b/projects/plugins/social/src/js/components/social-image-generator-toggle/index.tsx
index 9c87fdc72d722..112e27b3eba92 100644
--- a/projects/plugins/social/src/js/components/social-image-generator-toggle/index.tsx
+++ b/projects/plugins/social/src/js/components/social-image-generator-toggle/index.tsx
@@ -72,7 +72,7 @@ const SocialImageGeneratorToggle: React.FC< SocialImageGeneratorToggleProps > =
>
{ __(
- 'When enabled, Social Image Generator will automatically generate social images for your posts. You can use the button below to choose a default template for new posts.',
+ 'When enabled, Social Image Generator will automatically generate social images for your posts. You can use the button below to choose a default template for new posts. This feature is only supported in the block editor.',
'jetpack-social'
) }
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/prerelease#4 b/projects/plugins/starter-plugin/changelog/prerelease#4
similarity index 100%
rename from projects/plugins/automattic-for-agencies-client/changelog/prerelease#4
rename to projects/plugins/starter-plugin/changelog/prerelease#4
diff --git a/projects/plugins/search/changelog/renovate-lock-file-maintenance#2 b/projects/plugins/starter-plugin/changelog/renovate-lock-file-maintenance#2
similarity index 100%
rename from projects/plugins/search/changelog/renovate-lock-file-maintenance#2
rename to projects/plugins/starter-plugin/changelog/renovate-lock-file-maintenance#2
diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock
index 1d34db41069a8..dbc3bce90162d 100644
--- a/projects/plugins/starter-plugin/composer.lock
+++ b/projects/plugins/starter-plugin/composer.lock
@@ -1672,7 +1672,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "ece2cb5be16c8bc399fb6681a61ffa42b42e3cf5"
+ "reference": "9f24b0cb0912e1e3f235e946b9f397ffd9e36ccf"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -1705,7 +1705,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "4.2.x-dev"
+ "dev-trunk": "4.3.x-dev"
},
"dependencies": {
"test-only": [
@@ -1748,16 +1748,16 @@
"packages-dev": [
{
"name": "antecedent/patchwork",
- "version": "2.2.0",
+ "version": "2.2.1",
"source": {
"type": "git",
"url": "https://github.com/antecedent/patchwork.git",
- "reference": "b07d4fb37c3c723c8755122160c089e077d5de65"
+ "reference": "1bf183a3e1bd094f231a2128b9ecc5363c269245"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/antecedent/patchwork/zipball/b07d4fb37c3c723c8755122160c089e077d5de65",
- "reference": "b07d4fb37c3c723c8755122160c089e077d5de65",
+ "url": "https://api.github.com/repos/antecedent/patchwork/zipball/1bf183a3e1bd094f231a2128b9ecc5363c269245",
+ "reference": "1bf183a3e1bd094f231a2128b9ecc5363c269245",
"shasum": ""
},
"require": {
@@ -1790,9 +1790,9 @@
],
"support": {
"issues": "https://github.com/antecedent/patchwork/issues",
- "source": "https://github.com/antecedent/patchwork/tree/2.2.0"
+ "source": "https://github.com/antecedent/patchwork/tree/2.2.1"
},
- "time": "2024-09-27T16:59:55+00:00"
+ "time": "2024-12-11T10:19:54+00:00"
},
{
"name": "automattic/jetpack-changelogger",
@@ -2252,16 +2252,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.1",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
"shasum": ""
},
"require": {
@@ -2304,9 +2304,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
},
- "time": "2024-10-08T18:51:32+00:00"
+ "time": "2024-12-30T11:07:19+00:00"
},
{
"name": "phar-io/manifest",
@@ -4050,16 +4050,16 @@
},
{
"name": "symfony/console",
- "version": "v7.2.0",
+ "version": "v7.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf"
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
+ "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
"shasum": ""
},
"require": {
@@ -4123,7 +4123,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.2.0"
+ "source": "https://github.com/symfony/console/tree/v7.2.1"
},
"funding": [
{
@@ -4139,7 +4139,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-06T14:24:19+00:00"
+ "time": "2024-12-11T03:49:26+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -4160,12 +4160,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4472,8 +4472,8 @@
"type": "library",
"extra": {
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -4611,12 +4611,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4809,16 +4809,16 @@
},
{
"name": "yoast/phpunit-polyfills",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be"
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
+ "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
"shasum": ""
},
"require": {
@@ -4868,7 +4868,7 @@
"security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
"source": "https://github.com/Yoast/PHPUnit-Polyfills"
},
- "time": "2024-09-06T22:03:10+00:00"
+ "time": "2025-01-08T16:58:34+00:00"
}
],
"aliases": [],
diff --git a/projects/plugins/super-cache/CHANGELOG.md b/projects/plugins/super-cache/CHANGELOG.md
index 22bcc1f332c5c..6f7886efac254 100644
--- a/projects/plugins/super-cache/CHANGELOG.md
+++ b/projects/plugins/super-cache/CHANGELOG.md
@@ -5,6 +5,26 @@
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).
+## [2.0.0] - 2025-01-10
+### Added
+- Enable test coverage. [#39961]
+
+### Changed
+- General: Indicate compatibility with the upcoming version of WordPress - 6.7. [#39786]
+- Updated package dependencies. [#38822] [#38870] [#39004] [#39278] [#39288] [#39653] [#40116] [#40515]
+
+### Removed
+- Cleaned up legacy code. [#40200]
+- General: Update minimum PHP version to 7.2. [#40147]
+- General: Update minimum WordPress version to 6.6. [#40146]
+
+### Fixed
+- Caching: make sure there is cache content to serve, even if the cache file was found [#40342]
+- Ensure homepage cache gets flushed when a post is unpublished. [#40879]
+- Lossless image optimization for images (should improve performance with no visible changes). [#38750] [#38981]
+- Move trailing space out of i18n message. [#39305]
+- Fix apache_request_headers fallback so it works when that command is disabled. [#39951]
+
## [1.12.4] - 2024-07-17
### Removed
- General: update WordPress version requirements to WordPress 6.5. [#38382]
@@ -764,6 +784,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
Misc fixes
+[2.0.0]: https://github.com/Automattic/wp-super-cache/compare/v1.12.4...v2.0.0
[1.12.4]: https://github.com/Automattic/wp-super-cache/compare/v1.12.3...v1.12.4
[1.12.3]: https://github.com/Automattic/wp-super-cache/compare/v1.12.2...v1.12.3
[1.12.2]: https://github.com/Automattic/wp-super-cache/compare/v1.12.1...v1.12.2
diff --git a/projects/plugins/super-cache/changelog/add-phpunit-coverage-configs b/projects/plugins/super-cache/changelog/add-phpunit-coverage-configs
deleted file mode 100644
index 714f2593c8f4b..0000000000000
--- a/projects/plugins/super-cache/changelog/add-phpunit-coverage-configs
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Add missing files/dirs to phpunit coverage config.
-
-
diff --git a/projects/plugins/super-cache/changelog/bugfix-supercache-unpublish b/projects/plugins/super-cache/changelog/bugfix-supercache-unpublish
deleted file mode 100644
index f6716f90fa058..0000000000000
--- a/projects/plugins/super-cache/changelog/bugfix-supercache-unpublish
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Ensure homepage cache gets flushed when a post is unpublished.
diff --git a/projects/plugins/super-cache/changelog/fix-bump_composer_versions_round2 b/projects/plugins/super-cache/changelog/fix-bump_composer_versions_round2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/super-cache/changelog/fix-bump_composer_versions_round2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/super-cache/changelog/fix-mu-wpcom-scssphp b/projects/plugins/super-cache/changelog/fix-mu-wpcom-scssphp
deleted file mode 100644
index 25e5011cf37d0..0000000000000
--- a/projects/plugins/super-cache/changelog/fix-mu-wpcom-scssphp
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Change blanket `vendor/**` production-include entry to include only what we know we want.
-
-
diff --git a/projects/plugins/super-cache/changelog/prerelease b/projects/plugins/super-cache/changelog/prerelease
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/super-cache/changelog/prerelease
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/super-cache/changelog/prerelease#2 b/projects/plugins/super-cache/changelog/prerelease#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/super-cache/changelog/prerelease#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/super-cache/changelog/remove-eslintrc-unneeded-parseroptions b/projects/plugins/super-cache/changelog/remove-eslintrc-unneeded-parseroptions
deleted file mode 100644
index e9871ae770e2f..0000000000000
--- a/projects/plugins/super-cache/changelog/remove-eslintrc-unneeded-parseroptions
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: removed
-Comment: Remove unneeded `parserOptions` from eslintrc.
-
-
diff --git a/projects/plugins/super-cache/changelog/remove-pre_wp6.6_and_php7.2_code b/projects/plugins/super-cache/changelog/remove-pre_wp6.6_and_php7.2_code
deleted file mode 100644
index 3652253bc0e2f..0000000000000
--- a/projects/plugins/super-cache/changelog/remove-pre_wp6.6_and_php7.2_code
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: removed
-
-Cleaned up legacy code.
diff --git a/projects/plugins/super-cache/changelog/renovate-js-unit-testing-packages b/projects/plugins/super-cache/changelog/renovate-js-unit-testing-packages
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/super-cache/changelog/renovate-js-unit-testing-packages
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/super-cache/changelog/renovate-lock-file-maintenance#3 b/projects/plugins/super-cache/changelog/renovate-lock-file-maintenance#3
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/super-cache/changelog/renovate-lock-file-maintenance#3
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/super-cache/changelog/renovate-lock-file-maintenance#4 b/projects/plugins/super-cache/changelog/renovate-lock-file-maintenance#4
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/super-cache/changelog/renovate-lock-file-maintenance#4
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/super-cache/changelog/renovate-lock-file-maintenance#5 b/projects/plugins/super-cache/changelog/renovate-lock-file-maintenance#5
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/super-cache/changelog/renovate-lock-file-maintenance#5
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/super-cache/changelog/renovate-lock-file-maintenance#6 b/projects/plugins/super-cache/changelog/renovate-lock-file-maintenance#6
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/super-cache/changelog/renovate-lock-file-maintenance#6
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/super-cache/changelog/renovate-lock-file-maintenance#7 b/projects/plugins/super-cache/changelog/renovate-lock-file-maintenance#7
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/super-cache/changelog/renovate-lock-file-maintenance#7
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/super-cache/changelog/renovate-npm-axios-vulnerability b/projects/plugins/super-cache/changelog/renovate-npm-axios-vulnerability
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/super-cache/changelog/renovate-npm-axios-vulnerability
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/super-cache/changelog/renovate-yoast-phpunit-polyfills-1.x b/projects/plugins/super-cache/changelog/renovate-yoast-phpunit-polyfills-1.x
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/super-cache/changelog/renovate-yoast-phpunit-polyfills-1.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/super-cache/changelog/restore-jp_test_coverage b/projects/plugins/super-cache/changelog/restore-jp_test_coverage
deleted file mode 100644
index 7bb19dc79dd19..0000000000000
--- a/projects/plugins/super-cache/changelog/restore-jp_test_coverage
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Enable test coverage.
diff --git a/projects/plugins/super-cache/changelog/restore-jp_test_coverage#2 b/projects/plugins/super-cache/changelog/restore-jp_test_coverage#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/super-cache/changelog/restore-jp_test_coverage#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/super-cache/changelog/revert-svg-image-optimizations b/projects/plugins/super-cache/changelog/revert-svg-image-optimizations
deleted file mode 100644
index 356496f8a1f8f..0000000000000
--- a/projects/plugins/super-cache/changelog/revert-svg-image-optimizations
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Revert recent SVG image optimizations.
diff --git a/projects/plugins/super-cache/changelog/try-lossless-image-optmization-part-3 b/projects/plugins/super-cache/changelog/try-lossless-image-optmization-part-3
deleted file mode 100644
index cf77a8b55bb43..0000000000000
--- a/projects/plugins/super-cache/changelog/try-lossless-image-optmization-part-3
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Lossless image optimization for images (should improve performance with no visible changes).
diff --git a/projects/plugins/super-cache/changelog/try-no-version-bumps-in-trunk b/projects/plugins/super-cache/changelog/try-no-version-bumps-in-trunk
deleted file mode 100644
index 91efe85c55e06..0000000000000
--- a/projects/plugins/super-cache/changelog/try-no-version-bumps-in-trunk
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Un-bump version numbers in trunk. The build will now update the version numbers as needed for mirrors.
-
-
diff --git a/projects/plugins/super-cache/changelog/update-bump_min_php_to_7.2 b/projects/plugins/super-cache/changelog/update-bump_min_php_to_7.2
deleted file mode 100644
index 712ab5f494aaa..0000000000000
--- a/projects/plugins/super-cache/changelog/update-bump_min_php_to_7.2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: major
-Type: removed
-
-General: Update minimum PHP version to 7.2.
diff --git a/projects/plugins/super-cache/changelog/update-bump_min_php_to_7.2#2 b/projects/plugins/super-cache/changelog/update-bump_min_php_to_7.2#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/super-cache/changelog/update-bump_min_php_to_7.2#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/super-cache/changelog/update-bump_min_wp_to_6.6 b/projects/plugins/super-cache/changelog/update-bump_min_wp_to_6.6
deleted file mode 100644
index b5daa14e55bc4..0000000000000
--- a/projects/plugins/super-cache/changelog/update-bump_min_wp_to_6.6
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: major
-Type: removed
-
-General: Update minimum WordPress version to 6.6.
diff --git a/projects/plugins/super-cache/changelog/update-cleanup-deprecated-eslint-rules b/projects/plugins/super-cache/changelog/update-cleanup-deprecated-eslint-rules
deleted file mode 100644
index 94aaa5b70a786..0000000000000
--- a/projects/plugins/super-cache/changelog/update-cleanup-deprecated-eslint-rules
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Remove unnecessary overrides from eslintrc.
-
-
diff --git a/projects/plugins/super-cache/changelog/update-cleanup-project-level-eslint-prettier b/projects/plugins/super-cache/changelog/update-cleanup-project-level-eslint-prettier
deleted file mode 100644
index a323d1564a187..0000000000000
--- a/projects/plugins/super-cache/changelog/update-cleanup-project-level-eslint-prettier
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Enable prettier via eslint, and fix issues.
-
-
diff --git a/projects/plugins/super-cache/changelog/update-composer b/projects/plugins/super-cache/changelog/update-composer
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/super-cache/changelog/update-composer
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/super-cache/changelog/update-eslint-9 b/projects/plugins/super-cache/changelog/update-eslint-9
deleted file mode 100644
index 1cb10572ab69e..0000000000000
--- a/projects/plugins/super-cache/changelog/update-eslint-9
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Update eslint config for eslint 9.
-
-
diff --git a/projects/plugins/super-cache/changelog/update-plugins-fix-eslint-9-lints b/projects/plugins/super-cache/changelog/update-plugins-fix-eslint-9-lints
deleted file mode 100644
index b3176fbef2f88..0000000000000
--- a/projects/plugins/super-cache/changelog/update-plugins-fix-eslint-9-lints
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Fix some JS lints ahead of eslint 9 upgrade.
-
-
diff --git a/projects/plugins/super-cache/changelog/update-super-cache-cache-file-race-condition b/projects/plugins/super-cache/changelog/update-super-cache-cache-file-race-condition
deleted file mode 100644
index 142a0ba3b9648..0000000000000
--- a/projects/plugins/super-cache/changelog/update-super-cache-cache-file-race-condition
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Caching: make sure there is cache content to serve, even if the cache file was found
diff --git a/projects/plugins/super-cache/changelog/update-super-cache-get-apache-headers b/projects/plugins/super-cache/changelog/update-super-cache-get-apache-headers
deleted file mode 100644
index d43c4d6b80f59..0000000000000
--- a/projects/plugins/super-cache/changelog/update-super-cache-get-apache-headers
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Super Cache: Fixed the apache_request_headers fallback so it works when that command is disabled
diff --git a/projects/plugins/super-cache/changelog/update-switch-to-raw-coverage-files b/projects/plugins/super-cache/changelog/update-switch-to-raw-coverage-files
deleted file mode 100644
index bfd48f31ebc60..0000000000000
--- a/projects/plugins/super-cache/changelog/update-switch-to-raw-coverage-files
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Generate raw phpunit and/or jest coverage data instead of clover.
-
-
diff --git a/projects/plugins/super-cache/changelog/update-tested-to-6-7 b/projects/plugins/super-cache/changelog/update-tested-to-6-7
deleted file mode 100644
index 9c1d5b4fabb5f..0000000000000
--- a/projects/plugins/super-cache/changelog/update-tested-to-6-7
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-General: indicate compatibility with the upcoming version of WordPress - 6.7.
diff --git a/projects/plugins/super-cache/changelog/update-wordpress-eslint-plugin b/projects/plugins/super-cache/changelog/update-wordpress-eslint-plugin
deleted file mode 100644
index 1b5211fc7fb1d..0000000000000
--- a/projects/plugins/super-cache/changelog/update-wordpress-eslint-plugin
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Move trailing space out of i18n message.
diff --git a/projects/plugins/super-cache/composer.json b/projects/plugins/super-cache/composer.json
index 6329d22f872ff..e8fdb4f6dc68b 100644
--- a/projects/plugins/super-cache/composer.json
+++ b/projects/plugins/super-cache/composer.json
@@ -54,6 +54,6 @@
"wp-svn-autopublish": true
},
"config": {
- "autoloader-suffix": "6fe342bc02f0b440f7b3c8d8ade42286_super_cacheⓥ1_12_4"
+ "autoloader-suffix": "6fe342bc02f0b440f7b3c8d8ade42286_super_cacheⓥ2_0_0"
}
}
diff --git a/projects/plugins/super-cache/composer.lock b/projects/plugins/super-cache/composer.lock
index 18e5e15b2bc6a..99712d9d267fb 100644
--- a/projects/plugins/super-cache/composer.lock
+++ b/projects/plugins/super-cache/composer.lock
@@ -270,16 +270,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.1",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
"shasum": ""
},
"require": {
@@ -322,9 +322,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
},
- "time": "2024-10-08T18:51:32+00:00"
+ "time": "2024-12-30T11:07:19+00:00"
},
{
"name": "phar-io/manifest",
@@ -1884,16 +1884,16 @@
},
{
"name": "symfony/console",
- "version": "v7.2.0",
+ "version": "v7.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf"
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
+ "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
"shasum": ""
},
"require": {
@@ -1957,7 +1957,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.2.0"
+ "source": "https://github.com/symfony/console/tree/v7.2.1"
},
"funding": [
{
@@ -1973,7 +1973,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-06T14:24:19+00:00"
+ "time": "2024-12-11T03:49:26+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -1994,12 +1994,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -2306,8 +2306,8 @@
"type": "library",
"extra": {
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -2445,12 +2445,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -2643,16 +2643,16 @@
},
{
"name": "yoast/phpunit-polyfills",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be"
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
+ "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
"shasum": ""
},
"require": {
@@ -2702,7 +2702,7 @@
"security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
"source": "https://github.com/Yoast/PHPUnit-Polyfills"
},
- "time": "2024-09-06T22:03:10+00:00"
+ "time": "2025-01-08T16:58:34+00:00"
}
],
"aliases": [],
diff --git a/projects/plugins/super-cache/package.json b/projects/plugins/super-cache/package.json
index 8ed695628f84f..dfdef9da30307 100644
--- a/projects/plugins/super-cache/package.json
+++ b/projects/plugins/super-cache/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-super-cache",
- "version": "1.12.4",
+ "version": "2.0.0",
"description": "A very fast caching engine for WordPress that produces static html files.",
"homepage": "https://jetpack.com",
"bugs": {
diff --git a/projects/plugins/super-cache/readme.txt b/projects/plugins/super-cache/readme.txt
index d5c43e1b090f5..f6374d4146dd1 100644
--- a/projects/plugins/super-cache/readme.txt
+++ b/projects/plugins/super-cache/readme.txt
@@ -3,7 +3,7 @@ Contributors: donncha, automattic, adnan007, dilirity, mikemayhem3030, pyronaur,
Tags: performance, caching, wp-cache, wp-super-cache, cache
Requires at least: 6.6
Requires PHP: 7.2
-Tested up to: 6.7
+Tested up to: 6.7.1
Stable tag: 1.12.3
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -268,12 +268,25 @@ Your theme is probably responsive which means it resizes the page to suit whatev
== Changelog ==
-### 1.12.4 - 2024-07-17
+### 2.0.0 - 2025-01-10
+#### Added
+- Enable test coverage.
+
+#### Changed
+- General: Indicate compatibility with the upcoming version of WordPress - 6.7.
+- Updated package dependencies.
+
#### Removed
-- General: update WordPress version requirements to WordPress 6.5.
+- Cleaned up legacy code.
+- General: Update minimum PHP version to 7.2.
+- General: Update minimum WordPress version to 6.6.
#### Fixed
-- Fixed problem with is_utf8_charset missing in WP 6.6
+- Caching: make sure there is cache content to serve, even if the cache file was found
+- Ensure homepage cache gets flushed when a post is unpublished.
+- Lossless image optimization for images (should improve performance with no visible changes).
+- Move trailing space out of i18n message.
+- Fix apache_request_headers fallback so it works when that command is disabled.
--------
diff --git a/projects/plugins/super-cache/wp-cache.php b/projects/plugins/super-cache/wp-cache.php
index 5aa1c630b8af9..a976034c21d0a 100644
--- a/projects/plugins/super-cache/wp-cache.php
+++ b/projects/plugins/super-cache/wp-cache.php
@@ -3,7 +3,7 @@
* Plugin Name: WP Super Cache
* Plugin URI: https://wordpress.org/plugins/wp-super-cache/
* Description: Very fast caching plugin for WordPress.
- * Version: 1.12.4
+ * Version: 2.0.0
* Author: Automattic
* Author URI: https://automattic.com/
* License: GPL2+
diff --git a/projects/plugins/vaultpress/CHANGELOG.md b/projects/plugins/vaultpress/CHANGELOG.md
index ad8dcdaa8a3b3..4ec783b5a431e 100644
--- a/projects/plugins/vaultpress/CHANGELOG.md
+++ b/projects/plugins/vaultpress/CHANGELOG.md
@@ -2,6 +2,25 @@
All notable changes to this project will be documented in this file.
+## 4.0.0 - 2025-01-10
+### Added
+- Enable test coverage. [#39961]
+- Hook into red bubble notification when bad installation is detected. [#36449]
+
+### Changed
+- General: Indicate compatibility with the upcoming version of WordPress - 6.6. [#37962]
+- General: Indicate compatibility with the upcoming version of WordPress - 6.7. [#39786]
+- General: Use wp_admin_notice function introduced in WP 6.4 to display notices. [#37051]
+- Only show installation errors on plugins page. [#36390]
+- Updated package dependencies. [#36309] [#36775] [#37348] [#37767] [#38228] [#38822] [#39004] [#39288] [#39653] [#40116] [#40515]
+
+### Removed
+- Cleaned up legacy code. [#40200]
+- General: Update minimum PHP version to 7.2. [#40147]
+
+### Fixed
+- Lossless image optimization for images (should improve performance with no visible changes). [#38750] [#38981]
+
## 3.0.0 - 2024-02-21
### Changed
- General: indicate compatibility with the upcoming version of WordPress, 6.5. [#35820]
diff --git a/projects/plugins/vaultpress/changelog/add-bad-installation-notices-to-my-jetpack b/projects/plugins/vaultpress/changelog/add-bad-installation-notices-to-my-jetpack
deleted file mode 100644
index 5cf6fb645e17e..0000000000000
--- a/projects/plugins/vaultpress/changelog/add-bad-installation-notices-to-my-jetpack
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Hook into red bubble notification when bad installation is detected
diff --git a/projects/plugins/vaultpress/changelog/add-phan b/projects/plugins/vaultpress/changelog/add-phan
deleted file mode 100644
index 976dd1167f5e1..0000000000000
--- a/projects/plugins/vaultpress/changelog/add-phan
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: added
-Comment: Add Phan configuration. No change to the project itself.
-
-
diff --git a/projects/plugins/vaultpress/changelog/add-phan-more-constant-stubs b/projects/plugins/vaultpress/changelog/add-phan-more-constant-stubs
deleted file mode 100644
index 40c026ae51a49..0000000000000
--- a/projects/plugins/vaultpress/changelog/add-phan-more-constant-stubs
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Update phan baseline for config changes. No change to functionality.
-
-
diff --git a/projects/plugins/vaultpress/changelog/add-phan-wp-constant-stubs b/projects/plugins/vaultpress/changelog/add-phan-wp-constant-stubs
deleted file mode 100644
index 94a5f73d3ea02..0000000000000
--- a/projects/plugins/vaultpress/changelog/add-phan-wp-constant-stubs
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Update Phan baseline for config change. No change to functionality.
-
-
diff --git a/projects/plugins/vaultpress/changelog/fix-bump_composer_versions_round2#2 b/projects/plugins/vaultpress/changelog/fix-bump_composer_versions_round2#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/fix-bump_composer_versions_round2#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/fix-phan-in-changelogger b/projects/plugins/vaultpress/changelog/fix-phan-in-changelogger
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/fix-phan-in-changelogger
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/fix-phan-undeclared-in-autoloader b/projects/plugins/vaultpress/changelog/fix-phan-undeclared-in-autoloader
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/fix-phan-undeclared-in-autoloader
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/prerelease b/projects/plugins/vaultpress/changelog/prerelease
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/prerelease
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/prerelease#2 b/projects/plugins/vaultpress/changelog/prerelease#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/prerelease#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/prerelease#3 b/projects/plugins/vaultpress/changelog/prerelease#3
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/prerelease#3
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/prerelease#4 b/projects/plugins/vaultpress/changelog/prerelease#4
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/prerelease#4
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/prerelease#5 b/projects/plugins/vaultpress/changelog/prerelease#5
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/prerelease#5
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/prerelease#6 b/projects/plugins/vaultpress/changelog/prerelease#6
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/prerelease#6
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/prerelease#7 b/projects/plugins/vaultpress/changelog/prerelease#7
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/prerelease#7
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/prerelease#8 b/projects/plugins/vaultpress/changelog/prerelease#8
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/prerelease#8
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/remove-pre_wp6.6_and_php7.2_code b/projects/plugins/vaultpress/changelog/remove-pre_wp6.6_and_php7.2_code
deleted file mode 100644
index 3652253bc0e2f..0000000000000
--- a/projects/plugins/vaultpress/changelog/remove-pre_wp6.6_and_php7.2_code
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: removed
-
-Cleaned up legacy code.
diff --git a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#10 b/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#10
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#10
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#11 b/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#11
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#11
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#12 b/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#12
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#12
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#2 b/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#2
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#3 b/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#3
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#3
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#4 b/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#4
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#4
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#5 b/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#5
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#5
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#6 b/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#6
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#6
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#7 b/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#7
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#7
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#8 b/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#8
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#8
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#9 b/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#9
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/renovate-lock-file-maintenance#9
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/renovate-yoast-phpunit-polyfills-1.x b/projects/plugins/vaultpress/changelog/renovate-yoast-phpunit-polyfills-1.x
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/vaultpress/changelog/renovate-yoast-phpunit-polyfills-1.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/vaultpress/changelog/restore-jp_test_coverage b/projects/plugins/vaultpress/changelog/restore-jp_test_coverage
deleted file mode 100644
index 7bb19dc79dd19..0000000000000
--- a/projects/plugins/vaultpress/changelog/restore-jp_test_coverage
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Enable test coverage.
diff --git a/projects/plugins/vaultpress/changelog/restore-jp_test_coverage#2 b/projects/plugins/vaultpress/changelog/restore-jp_test_coverage#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/restore-jp_test_coverage#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/revert-svg-image-optimizations b/projects/plugins/vaultpress/changelog/revert-svg-image-optimizations
deleted file mode 100644
index 356496f8a1f8f..0000000000000
--- a/projects/plugins/vaultpress/changelog/revert-svg-image-optimizations
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Revert recent SVG image optimizations.
diff --git a/projects/plugins/vaultpress/changelog/try-lossless-image-optmization-part-3 b/projects/plugins/vaultpress/changelog/try-lossless-image-optmization-part-3
deleted file mode 100644
index cf77a8b55bb43..0000000000000
--- a/projects/plugins/vaultpress/changelog/try-lossless-image-optmization-part-3
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-Lossless image optimization for images (should improve performance with no visible changes).
diff --git a/projects/plugins/vaultpress/changelog/try-no-version-bumps-in-trunk b/projects/plugins/vaultpress/changelog/try-no-version-bumps-in-trunk
deleted file mode 100644
index 91efe85c55e06..0000000000000
--- a/projects/plugins/vaultpress/changelog/try-no-version-bumps-in-trunk
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Un-bump version numbers in trunk. The build will now update the version numbers as needed for mirrors.
-
-
diff --git a/projects/plugins/vaultpress/changelog/update-bump_min_php_to_7.2 b/projects/plugins/vaultpress/changelog/update-bump_min_php_to_7.2
deleted file mode 100644
index 712ab5f494aaa..0000000000000
--- a/projects/plugins/vaultpress/changelog/update-bump_min_php_to_7.2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: major
-Type: removed
-
-General: Update minimum PHP version to 7.2.
diff --git a/projects/plugins/vaultpress/changelog/update-bump_min_php_to_7.2#2 b/projects/plugins/vaultpress/changelog/update-bump_min_php_to_7.2#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/update-bump_min_php_to_7.2#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/update-composer b/projects/plugins/vaultpress/changelog/update-composer
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/update-composer
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/update-installation-error-to-only-show-on-plugins-page b/projects/plugins/vaultpress/changelog/update-installation-error-to-only-show-on-plugins-page
deleted file mode 100644
index 7f125b899fd84..0000000000000
--- a/projects/plugins/vaultpress/changelog/update-installation-error-to-only-show-on-plugins-page
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Only show installation errors on plugins page
diff --git a/projects/plugins/vaultpress/changelog/update-switch-to-raw-coverage-files b/projects/plugins/vaultpress/changelog/update-switch-to-raw-coverage-files
deleted file mode 100644
index bfd48f31ebc60..0000000000000
--- a/projects/plugins/vaultpress/changelog/update-switch-to-raw-coverage-files
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Generate raw phpunit and/or jest coverage data instead of clover.
-
-
diff --git a/projects/plugins/vaultpress/changelog/update-symfony-console b/projects/plugins/vaultpress/changelog/update-symfony-console
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/vaultpress/changelog/update-symfony-console
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/vaultpress/changelog/update-tested-to-6-6 b/projects/plugins/vaultpress/changelog/update-tested-to-6-6
deleted file mode 100644
index 6cf57dbe55f90..0000000000000
--- a/projects/plugins/vaultpress/changelog/update-tested-to-6-6
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-General: indicate compatibility with the upcoming version of WordPress - 6.6.
diff --git a/projects/plugins/vaultpress/changelog/update-tested-to-6-7 b/projects/plugins/vaultpress/changelog/update-tested-to-6-7
deleted file mode 100644
index 9c1d5b4fabb5f..0000000000000
--- a/projects/plugins/vaultpress/changelog/update-tested-to-6-7
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-General: indicate compatibility with the upcoming version of WordPress - 6.7.
diff --git a/projects/plugins/vaultpress/changelog/update-use-wp-admin-notice b/projects/plugins/vaultpress/changelog/update-use-wp-admin-notice
deleted file mode 100644
index 2988ba2249366..0000000000000
--- a/projects/plugins/vaultpress/changelog/update-use-wp-admin-notice
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-General: use wp_admin_notice function introduced in WP 6.4 to display notices.
diff --git a/projects/plugins/vaultpress/composer.json b/projects/plugins/vaultpress/composer.json
index 9d3dedae2096c..454f86eb707d4 100644
--- a/projects/plugins/vaultpress/composer.json
+++ b/projects/plugins/vaultpress/composer.json
@@ -38,7 +38,7 @@
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
- "autoloader-suffix": "9559eef123208b7d1b9c15b978567267_vaultpressⓥ3_0_0",
+ "autoloader-suffix": "9559eef123208b7d1b9c15b978567267_vaultpressⓥ4_0_0",
"allow-plugins": {
"automattic/jetpack-autoloader": true
}
diff --git a/projects/plugins/vaultpress/composer.lock b/projects/plugins/vaultpress/composer.lock
index 59abed20833a8..a6deda9f7f71a 100644
--- a/projects/plugins/vaultpress/composer.lock
+++ b/projects/plugins/vaultpress/composer.lock
@@ -338,16 +338,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.1",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
"shasum": ""
},
"require": {
@@ -390,9 +390,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
},
- "time": "2024-10-08T18:51:32+00:00"
+ "time": "2024-12-30T11:07:19+00:00"
},
{
"name": "phar-io/manifest",
@@ -1952,16 +1952,16 @@
},
{
"name": "symfony/console",
- "version": "v7.2.0",
+ "version": "v7.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf"
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
+ "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
"shasum": ""
},
"require": {
@@ -2025,7 +2025,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.2.0"
+ "source": "https://github.com/symfony/console/tree/v7.2.1"
},
"funding": [
{
@@ -2041,7 +2041,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-06T14:24:19+00:00"
+ "time": "2024-12-11T03:49:26+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -2062,12 +2062,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -2374,8 +2374,8 @@
"type": "library",
"extra": {
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -2513,12 +2513,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -2711,16 +2711,16 @@
},
{
"name": "yoast/phpunit-polyfills",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be"
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
+ "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
"shasum": ""
},
"require": {
@@ -2770,7 +2770,7 @@
"security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
"source": "https://github.com/Yoast/PHPUnit-Polyfills"
},
- "time": "2024-09-06T22:03:10+00:00"
+ "time": "2025-01-08T16:58:34+00:00"
}
],
"aliases": [],
diff --git a/projects/plugins/vaultpress/readme.txt b/projects/plugins/vaultpress/readme.txt
index 693f16b277fe8..741b37c2f09e8 100644
--- a/projects/plugins/vaultpress/readme.txt
+++ b/projects/plugins/vaultpress/readme.txt
@@ -32,12 +32,25 @@ View our full list of FAQs at [http://help.vaultpress.com/faq/](http://help.vaul
A Jetpack VaultPress subscription is for a single WordPress site.
== Changelog ==
-### 3.0.0 - 2024-02-21
+### 4.0.0 - 2025-01-10
+#### Added
+- Enable test coverage.
+- Hook into red bubble notification when bad installation is detected.
+
#### Changed
-- General: indicate compatibility with the upcoming version of WordPress, 6.5.
-- General: updated PHP requirement to PHP 7.0+
+- General: Indicate compatibility with the upcoming version of WordPress - 6.6.
+- General: Indicate compatibility with the upcoming version of WordPress - 6.7.
+- General: Use wp_admin_notice function introduced in WP 6.4 to display notices.
+- Only show installation errors on plugins page.
- Updated package dependencies.
+#### Removed
+- Cleaned up legacy code.
+- General: Update minimum PHP version to 7.2.
+
+#### Fixed
+- Lossless image optimization for images (should improve performance with no visible changes).
+
--------
[See the previous changelogs here](https://github.com/Automattic/jetpack/blob/trunk/projects/plugins/vaultpress/CHANGELOG.md#changelog)
diff --git a/projects/plugins/vaultpress/vaultpress.php b/projects/plugins/vaultpress/vaultpress.php
index aa7970ac513c6..3107b05b3978a 100644
--- a/projects/plugins/vaultpress/vaultpress.php
+++ b/projects/plugins/vaultpress/vaultpress.php
@@ -3,7 +3,7 @@
* Plugin Name: VaultPress
* Plugin URI: http://vaultpress.com/?utm_source=plugin-uri&utm_medium=plugin-description&utm_campaign=1.0
* Description: Protect your content, themes, plugins, and settings with realtime backup and automated security scanning from VaultPress. Activate, enter your registration key, and never worry again. Need some help?
- * Version: 3.0.0
+ * Version: 4.0.0
* Author: Automattic
* Author URI: http://vaultpress.com/?utm_source=author-uri&utm_medium=plugin-description&utm_campaign=1.0
* License: GPL2+
@@ -17,7 +17,7 @@
defined( 'ABSPATH' ) || die();
define( 'VAULTPRESS__MINIMUM_PHP_VERSION', '7.2' );
-define( 'VAULTPRESS__VERSION', '3.0.0' );
+define( 'VAULTPRESS__VERSION', '4.0.0' );
define( 'VAULTPRESS__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
/**
diff --git a/projects/plugins/videopress/CHANGELOG.md b/projects/plugins/videopress/CHANGELOG.md
index e76629394a876..4b659009f9ab1 100644
--- a/projects/plugins/videopress/CHANGELOG.md
+++ b/projects/plugins/videopress/CHANGELOG.md
@@ -4,6 +4,29 @@ 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/).
+## 2.2 - 2025-01-10
+### Added
+- Add tracks for connection banner [#39732]
+- My Jetpack: Update the recommendations section in My Jetpack to include a slider interaction for the cards. [#39850]
+
+### Changed
+- General: Indicate compatibility with the upcoming version of WordPress - 6.7. [#39786]
+- Include `wp-polyfill` as a script dependency only when needed. [#39629]
+- Resolve an issue where revoked licenses were incorrectly treated as unattached. This caused users to be redirected to the license activation page after site connection, even when unattached licenses were not valid for activation. [#40215]
+- Social: Change My Jetpack CTA for Social from "Learn more" to "Activate". [#40359]
+- Updated dependencies. [#40286]
+- Updated package dependencies. [#39288] [#39302] [#39594] [#39653] [#39707] [#39999] [#40060] [#40116] [#40288] [#40363] [#40515] [#40564] [#40693] [#40815]
+
+### Removed
+- Connection: Remove deprecated `features_available` method. [#39442]
+- Connection: Remove deprecated `features_enabled` method. [#39475]
+- General: Update minimum PHP version to 7.2. [#40147]
+- General: Update minimum WordPress version to 6.6. [#40146]
+
+### Fixed
+- E2E Tests: Only install single browser used by Playwright. [#40827]
+- My Jetpack: Update GlobalNotice component to look better on mobile. [#39537]
+
## 2.1 - 2024-09-06
### Changed
- Internal updates.
diff --git a/projects/plugins/videopress/changelog/add-ci-always-process-coverage b/projects/plugins/videopress/changelog/add-ci-always-process-coverage
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/add-ci-always-process-coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/add-dependency-extraction-auto-polyfill b/projects/plugins/videopress/changelog/add-dependency-extraction-auto-polyfill
deleted file mode 100644
index f4cd286e166af..0000000000000
--- a/projects/plugins/videopress/changelog/add-dependency-extraction-auto-polyfill
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Only include `wp-polyfill` as a script dependency when needed.
diff --git a/projects/plugins/videopress/changelog/add-editor-blocks-add-tracks-for-connection-banner b/projects/plugins/videopress/changelog/add-editor-blocks-add-tracks-for-connection-banner
deleted file mode 100644
index 824195750d601..0000000000000
--- a/projects/plugins/videopress/changelog/add-editor-blocks-add-tracks-for-connection-banner
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Add tracks for connection banner
diff --git a/projects/plugins/videopress/changelog/add-features-enabled-rest-endpoint b/projects/plugins/videopress/changelog/add-features-enabled-rest-endpoint
deleted file mode 100644
index 57cf25c290a35..0000000000000
--- a/projects/plugins/videopress/changelog/add-features-enabled-rest-endpoint
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: removed
-
-Connection: Removed features_enabled deprecated method
diff --git a/projects/plugins/videopress/changelog/add-my-jetpack-recommendations-slider b/projects/plugins/videopress/changelog/add-my-jetpack-recommendations-slider
deleted file mode 100644
index 0658a74e13790..0000000000000
--- a/projects/plugins/videopress/changelog/add-my-jetpack-recommendations-slider
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: added
-
-My Jetpack: update the recommendations section in My Jetpack to include a slider interaction for the cards.
diff --git a/projects/plugins/videopress/changelog/add-restful-features-available b/projects/plugins/videopress/changelog/add-restful-features-available
deleted file mode 100644
index 152ef1efc4b7f..0000000000000
--- a/projects/plugins/videopress/changelog/add-restful-features-available
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: removed
-
-Connection: Removed deprecated method features_available
diff --git a/projects/plugins/videopress/changelog/fix-bump_composer_versions b/projects/plugins/videopress/changelog/fix-bump_composer_versions
deleted file mode 100644
index 13cbf3392f78d..0000000000000
--- a/projects/plugins/videopress/changelog/fix-bump_composer_versions
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated dependencies.
diff --git a/projects/plugins/videopress/changelog/fix-bump_composer_versions_round2#2 b/projects/plugins/videopress/changelog/fix-bump_composer_versions_round2#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/fix-bump_composer_versions_round2#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/fix-playwright_install_tweaks b/projects/plugins/videopress/changelog/fix-playwright_install_tweaks
deleted file mode 100644
index ebeba9b69f473..0000000000000
--- a/projects/plugins/videopress/changelog/fix-playwright_install_tweaks
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-E2E Tests: Only install single browser used by Playwright.
diff --git a/projects/plugins/videopress/changelog/fix-sync-filter-null-array b/projects/plugins/videopress/changelog/fix-sync-filter-null-array
deleted file mode 100644
index 3f56c90b3a7bf..0000000000000
--- a/projects/plugins/videopress/changelog/fix-sync-filter-null-array
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Sync: update filter parameter to avoid conflicts with other plugins.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease b/projects/plugins/videopress/changelog/prerelease
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease#10 b/projects/plugins/videopress/changelog/prerelease#10
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease#10
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease#11 b/projects/plugins/videopress/changelog/prerelease#11
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease#11
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease#12 b/projects/plugins/videopress/changelog/prerelease#12
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease#12
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease#13 b/projects/plugins/videopress/changelog/prerelease#13
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease#13
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease#14 b/projects/plugins/videopress/changelog/prerelease#14
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease#14
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease#15 b/projects/plugins/videopress/changelog/prerelease#15
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease#15
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease#16 b/projects/plugins/videopress/changelog/prerelease#16
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease#16
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease#17 b/projects/plugins/videopress/changelog/prerelease#17
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease#17
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease#18 b/projects/plugins/videopress/changelog/prerelease#18
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease#18
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease#2 b/projects/plugins/videopress/changelog/prerelease#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease#3 b/projects/plugins/videopress/changelog/prerelease#3
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease#3
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease#4 b/projects/plugins/videopress/changelog/prerelease#4
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease#4
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease#5 b/projects/plugins/videopress/changelog/prerelease#5
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease#5
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease#6 b/projects/plugins/videopress/changelog/prerelease#6
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease#6
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease#7 b/projects/plugins/videopress/changelog/prerelease#7
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease#7
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease#8 b/projects/plugins/videopress/changelog/prerelease#8
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease#8
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/prerelease#9 b/projects/plugins/videopress/changelog/prerelease#9
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/prerelease#9
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/renovate-babel-monorepo b/projects/plugins/videopress/changelog/renovate-babel-monorepo
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/videopress/changelog/renovate-babel-monorepo
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/videopress/changelog/renovate-brain-monkey-2.x b/projects/plugins/videopress/changelog/renovate-brain-monkey-2.x
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/renovate-brain-monkey-2.x
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/renovate-config-3.x b/projects/plugins/videopress/changelog/renovate-config-3.x
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/videopress/changelog/renovate-config-3.x
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/videopress/changelog/renovate-lock-file-maintenance#2 b/projects/plugins/videopress/changelog/renovate-lock-file-maintenance#2
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/videopress/changelog/renovate-lock-file-maintenance#2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/videopress/changelog/renovate-lock-file-maintenance#3 b/projects/plugins/videopress/changelog/renovate-lock-file-maintenance#3
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/renovate-lock-file-maintenance#3
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/renovate-lock-file-maintenance#4 b/projects/plugins/videopress/changelog/renovate-lock-file-maintenance#4
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/videopress/changelog/renovate-lock-file-maintenance#4
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/videopress/changelog/renovate-lock-file-maintenance#5 b/projects/plugins/videopress/changelog/renovate-lock-file-maintenance#5
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/renovate-lock-file-maintenance#5
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/renovate-lock-file-maintenance#6 b/projects/plugins/videopress/changelog/renovate-lock-file-maintenance#6
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/videopress/changelog/renovate-lock-file-maintenance#6
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/videopress/changelog/renovate-playwright-monorepo b/projects/plugins/videopress/changelog/renovate-playwright-monorepo
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/videopress/changelog/renovate-playwright-monorepo
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/videopress/changelog/renovate-wordpress-monorepo b/projects/plugins/videopress/changelog/renovate-wordpress-monorepo
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/videopress/changelog/renovate-wordpress-monorepo
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#2 b/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#2
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#3 b/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#3
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#3
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#4 b/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#4
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#4
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#5 b/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#5
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#5
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#6 b/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#6
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#6
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#7 b/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#7
deleted file mode 100644
index c47cb18e82997..0000000000000
--- a/projects/plugins/videopress/changelog/renovate-wordpress-monorepo#7
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Updated package dependencies.
diff --git a/projects/plugins/videopress/changelog/restore-jp_test_coverage b/projects/plugins/videopress/changelog/restore-jp_test_coverage
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/restore-jp_test_coverage
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/update-bump_min_php_to_7.2 b/projects/plugins/videopress/changelog/update-bump_min_php_to_7.2
deleted file mode 100644
index 712ab5f494aaa..0000000000000
--- a/projects/plugins/videopress/changelog/update-bump_min_php_to_7.2
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: major
-Type: removed
-
-General: Update minimum PHP version to 7.2.
diff --git a/projects/plugins/videopress/changelog/update-bump_min_php_to_7.2#2 b/projects/plugins/videopress/changelog/update-bump_min_php_to_7.2#2
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/update-bump_min_php_to_7.2#2
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/update-bump_min_wp_to_6.6 b/projects/plugins/videopress/changelog/update-bump_min_wp_to_6.6
deleted file mode 100644
index b5daa14e55bc4..0000000000000
--- a/projects/plugins/videopress/changelog/update-bump_min_wp_to_6.6
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: major
-Type: removed
-
-General: Update minimum WordPress version to 6.6.
diff --git a/projects/plugins/videopress/changelog/update-composer b/projects/plugins/videopress/changelog/update-composer
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/update-composer
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/update-eslint-9 b/projects/plugins/videopress/changelog/update-eslint-9
deleted file mode 100644
index 1cb10572ab69e..0000000000000
--- a/projects/plugins/videopress/changelog/update-eslint-9
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Update eslint config for eslint 9.
-
-
diff --git a/projects/plugins/videopress/changelog/update-fetch-available-licenses b/projects/plugins/videopress/changelog/update-fetch-available-licenses
deleted file mode 100644
index 3c349c8b1445e..0000000000000
--- a/projects/plugins/videopress/changelog/update-fetch-available-licenses
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Resolved an issue where revoked licenses were incorrectly treated as unattached. This caused users to be redirected to the license activation page after site connection, even when unattached licenses were not valid for activation.
diff --git a/projects/plugins/videopress/changelog/update-my-jetpack-notice-mobile-style b/projects/plugins/videopress/changelog/update-my-jetpack-notice-mobile-style
deleted file mode 100644
index c740afea846ef..0000000000000
--- a/projects/plugins/videopress/changelog/update-my-jetpack-notice-mobile-style
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-My Jetpack: visual update to the GlobalNotice component look better on mobile.
diff --git a/projects/plugins/videopress/changelog/update-my-jetpack-social-cta b/projects/plugins/videopress/changelog/update-my-jetpack-social-cta
deleted file mode 100644
index 6b1daf9c1b05e..0000000000000
--- a/projects/plugins/videopress/changelog/update-my-jetpack-social-cta
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Social | Changed My Jetpack CTA for Social from "Learn more" to "Activate"
diff --git a/projects/plugins/videopress/changelog/update-switch-to-raw-coverage-files b/projects/plugins/videopress/changelog/update-switch-to-raw-coverage-files
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/videopress/changelog/update-switch-to-raw-coverage-files
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/videopress/changelog/update-tested-to-6-7 b/projects/plugins/videopress/changelog/update-tested-to-6-7
deleted file mode 100644
index 9c1d5b4fabb5f..0000000000000
--- a/projects/plugins/videopress/changelog/update-tested-to-6-7
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-General: indicate compatibility with the upcoming version of WordPress - 6.7.
diff --git a/projects/plugins/videopress/composer.json b/projects/plugins/videopress/composer.json
index 8976f01a5114a..cf9be999c39f9 100644
--- a/projects/plugins/videopress/composer.json
+++ b/projects/plugins/videopress/composer.json
@@ -58,6 +58,6 @@
"automattic/jetpack-autoloader": true,
"automattic/jetpack-composer-plugin": true
},
- "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_videopressⓥ2_1"
+ "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_videopressⓥ2_2"
}
}
diff --git a/projects/plugins/videopress/composer.lock b/projects/plugins/videopress/composer.lock
index 6a9e6604f9891..b3a4670190208 100644
--- a/projects/plugins/videopress/composer.lock
+++ b/projects/plugins/videopress/composer.lock
@@ -1672,7 +1672,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "ece2cb5be16c8bc399fb6681a61ffa42b42e3cf5"
+ "reference": "9f24b0cb0912e1e3f235e946b9f397ffd9e36ccf"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -1705,7 +1705,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "4.2.x-dev"
+ "dev-trunk": "4.3.x-dev"
},
"dependencies": {
"test-only": [
@@ -2083,16 +2083,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.1",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
"shasum": ""
},
"require": {
@@ -2135,9 +2135,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
},
- "time": "2024-10-08T18:51:32+00:00"
+ "time": "2024-12-30T11:07:19+00:00"
},
{
"name": "phar-io/manifest",
@@ -3881,16 +3881,16 @@
},
{
"name": "symfony/console",
- "version": "v7.2.0",
+ "version": "v7.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf"
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
+ "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
"shasum": ""
},
"require": {
@@ -3954,7 +3954,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.2.0"
+ "source": "https://github.com/symfony/console/tree/v7.2.1"
},
"funding": [
{
@@ -3970,7 +3970,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-06T14:24:19+00:00"
+ "time": "2024-12-11T03:49:26+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -3991,12 +3991,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4303,8 +4303,8 @@
"type": "library",
"extra": {
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -4442,12 +4442,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4640,16 +4640,16 @@
},
{
"name": "yoast/phpunit-polyfills",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be"
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
+ "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
"shasum": ""
},
"require": {
@@ -4699,7 +4699,7 @@
"security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
"source": "https://github.com/Yoast/PHPUnit-Polyfills"
},
- "time": "2024-09-06T22:03:10+00:00"
+ "time": "2025-01-08T16:58:34+00:00"
}
],
"aliases": [],
diff --git a/projects/plugins/videopress/jetpack-videopress.php b/projects/plugins/videopress/jetpack-videopress.php
index a7f659ec8882d..e35192e00e268 100644
--- a/projects/plugins/videopress/jetpack-videopress.php
+++ b/projects/plugins/videopress/jetpack-videopress.php
@@ -4,7 +4,7 @@
* Plugin Name: Jetpack VideoPress
* Plugin URI: https://wordpress.org/plugins/jetpack-videopress
* Description: High quality, ad-free video.
- * Version: 2.1
+ * Version: 2.2
* Author: Automattic - Jetpack Video team
* Author URI: https://jetpack.com/videopress/
* License: GPLv2 or later
diff --git a/projects/plugins/videopress/readme.txt b/projects/plugins/videopress/readme.txt
index f2e1a317c67ec..70f6e71972111 100644
--- a/projects/plugins/videopress/readme.txt
+++ b/projects/plugins/videopress/readme.txt
@@ -84,7 +84,26 @@ The file size limit is 5 GB. However, on slower networks, there is a chance the
4. Edit your video details, cover image, and privacy from your VideoPress library.
== Changelog ==
-### 2.1 - 2024-09-06
+### 2.2 - 2025-01-10
+#### Added
+- Add tracks for connection banner
+- My Jetpack: Update the recommendations section in My Jetpack to include a slider interaction for the cards.
+
#### Changed
-- Internal updates.
+- General: Indicate compatibility with the upcoming version of WordPress - 6.7.
+- Include `wp-polyfill` as a script dependency only when needed.
+- Resolve an issue where revoked licenses were incorrectly treated as unattached. This caused users to be redirected to the license activation page after site connection, even when unattached licenses were not valid for activation.
+- Social: Change My Jetpack CTA for Social from "Learn more" to "Activate".
+- Updated dependencies.
+- Updated package dependencies.
+
+#### Removed
+- Connection: Remove deprecated `features_available` method.
+- Connection: Remove deprecated `features_enabled` method.
+- General: Update minimum PHP version to 7.2.
+- General: Update minimum WordPress version to 6.6.
+
+#### Fixed
+- E2E Tests: Only install single browser used by Playwright.
+- My Jetpack: Update GlobalNotice component to look better on mobile.
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/fix-bump_composer_versions_round2#2 b/projects/plugins/wpcomsh/changelog/add-jetpack-mu-wpcom-watch
similarity index 100%
rename from projects/plugins/automattic-for-agencies-client/changelog/fix-bump_composer_versions_round2#2
rename to projects/plugins/wpcomsh/changelog/add-jetpack-mu-wpcom-watch
diff --git a/projects/plugins/wpcomsh/changelog/add-masterbar-watch b/projects/plugins/wpcomsh/changelog/add-masterbar-watch
new file mode 100644
index 0000000000000..b2da7295dbf65
--- /dev/null
+++ b/projects/plugins/wpcomsh/changelog/add-masterbar-watch
@@ -0,0 +1,4 @@
+Significance: minor
+Type: changed
+
+update composer.lock file
diff --git a/projects/plugins/wpcomsh/changelog/feat-introduce-wpcom-external-media-import-page b/projects/plugins/wpcomsh/changelog/feat-introduce-wpcom-external-media-import-page
new file mode 100644
index 0000000000000..a2aefd2a0c34c
--- /dev/null
+++ b/projects/plugins/wpcomsh/changelog/feat-introduce-wpcom-external-media-import-page
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Import Media: Introduce the Import Media page
diff --git a/projects/plugins/wpcomsh/changelog/fix-edit-page-on-mobile b/projects/plugins/wpcomsh/changelog/fix-edit-page-on-mobile
new file mode 100644
index 0000000000000..2df92e6d1bb24
--- /dev/null
+++ b/projects/plugins/wpcomsh/changelog/fix-edit-page-on-mobile
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Page & Post: Fix the layout on mobile when details are open
diff --git a/projects/plugins/wpcomsh/changelog/fix-global-styles-notice-distraction-free b/projects/plugins/wpcomsh/changelog/fix-global-styles-notice-distraction-free
new file mode 100644
index 0000000000000..fb897e76fe370
--- /dev/null
+++ b/projects/plugins/wpcomsh/changelog/fix-global-styles-notice-distraction-free
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Global Styles: Stop showing the limited global styles notice in distraction free mode.
diff --git a/projects/plugins/wpcomsh/changelog/fix-testimonials-module-by-zero-error b/projects/plugins/wpcomsh/changelog/fix-testimonials-module-by-zero-error
new file mode 100644
index 0000000000000..cfcf858702e8b
--- /dev/null
+++ b/projects/plugins/wpcomsh/changelog/fix-testimonials-module-by-zero-error
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Testimonials: fix a shortcode related bug which ccurs if the column attribute is added and set to 0
diff --git a/projects/plugins/automattic-for-agencies-client/changelog/prerelease#5 b/projects/plugins/wpcomsh/changelog/prerelease#5
similarity index 100%
rename from projects/plugins/automattic-for-agencies-client/changelog/prerelease#5
rename to projects/plugins/wpcomsh/changelog/prerelease#5
diff --git a/projects/plugins/backup/changelog/prerelease#6 b/projects/plugins/wpcomsh/changelog/prerelease#6
similarity index 100%
rename from projects/plugins/backup/changelog/prerelease#6
rename to projects/plugins/wpcomsh/changelog/prerelease#6
diff --git a/projects/plugins/crm/changelog/prerelease#7 b/projects/plugins/wpcomsh/changelog/prerelease#7
similarity index 100%
rename from projects/plugins/crm/changelog/prerelease#7
rename to projects/plugins/wpcomsh/changelog/prerelease#7
diff --git a/projects/plugins/super-cache/changelog/renovate-lock-file-maintenance#2 b/projects/plugins/wpcomsh/changelog/renovate-lock-file-maintenance#2
similarity index 100%
rename from projects/plugins/super-cache/changelog/renovate-lock-file-maintenance#2
rename to projects/plugins/wpcomsh/changelog/renovate-lock-file-maintenance#2
diff --git a/projects/plugins/wpcomsh/changelog/update-wordads-wpcomsh-post-transfer b/projects/plugins/wpcomsh/changelog/update-wordads-wpcomsh-post-transfer
new file mode 100644
index 0000000000000..d724bbe881f31
--- /dev/null
+++ b/projects/plugins/wpcomsh/changelog/update-wordads-wpcomsh-post-transfer
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+woa: Enable wordads module via WP_CLI post transfer
diff --git a/projects/plugins/wpcomsh/composer.lock b/projects/plugins/wpcomsh/composer.lock
index bf7da6b26a9f3..8990f87d2d28b 100644
--- a/projects/plugins/wpcomsh/composer.lock
+++ b/projects/plugins/wpcomsh/composer.lock
@@ -472,7 +472,7 @@
"dist": {
"type": "path",
"url": "../../packages/classic-theme-helper",
- "reference": "198fd841c5341850e247c46168d77b1bc6a13a34"
+ "reference": "97a68997e5f3dc805df942c53586bab3f2137427"
},
"require": {
"automattic/jetpack-assets": "@dev",
@@ -490,7 +490,7 @@
"extra": {
"autotagger": true,
"branch-alias": {
- "dev-trunk": "0.8.x-dev"
+ "dev-trunk": "0.9.x-dev"
},
"changelogger": {
"link-template": "https://github.com/Automattic/jetpack-classic-theme-helper/compare/v${old}...v${new}"
@@ -1108,7 +1108,7 @@
"dist": {
"type": "path",
"url": "../../packages/masterbar",
- "reference": "f4317f289a90af787f81e695268be1ef00cd0255"
+ "reference": "f26d6309fe2d4ef4298d616f25f4e4d815c388bd"
},
"require": {
"automattic/jetpack-assets": "@dev",
@@ -1181,6 +1181,10 @@
"test-php": [
"pnpm run build-production",
"@composer phpunit"
+ ],
+ "watch": [
+ "Composer\\Config::disableProcessTimeout",
+ "pnpm run watch"
]
},
"license": [
@@ -1197,7 +1201,7 @@
"dist": {
"type": "path",
"url": "../../packages/jetpack-mu-wpcom",
- "reference": "63f823f3817e4c126abd96fc971ad6c39c8f1f01"
+ "reference": "7004e837cd80b875b6bd42f1e984f9f5e9114e03"
},
"require": {
"automattic/jetpack-assets": "@dev",
@@ -1231,7 +1235,7 @@
},
"autotagger": true,
"branch-alias": {
- "dev-trunk": "6.0.x-dev"
+ "dev-trunk": "6.1.x-dev"
},
"textdomain": "jetpack-mu-wpcom",
"version-constants": {
@@ -1264,6 +1268,10 @@
],
"post-update-cmd": [
"WorDBless\\Composer\\InstallDropin::copy"
+ ],
+ "watch": [
+ "Composer\\Config::disableProcessTimeout",
+ "pnpm run watch"
]
},
"license": [
@@ -1787,7 +1795,7 @@
"dist": {
"type": "path",
"url": "../../packages/sync",
- "reference": "ece2cb5be16c8bc399fb6681a61ffa42b42e3cf5"
+ "reference": "9f24b0cb0912e1e3f235e946b9f397ffd9e36ccf"
},
"require": {
"automattic/jetpack-connection": "@dev",
@@ -1820,7 +1828,7 @@
"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
},
"branch-alias": {
- "dev-trunk": "4.2.x-dev"
+ "dev-trunk": "4.3.x-dev"
},
"dependencies": {
"test-only": [
@@ -2411,16 +2419,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v5.3.1",
+ "version": "v5.4.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b"
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b",
- "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/447a020a1f875a434d62f2a401f53b82a396e494",
+ "reference": "447a020a1f875a434d62f2a401f53b82a396e494",
"shasum": ""
},
"require": {
@@ -2463,9 +2471,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v5.4.0"
},
- "time": "2024-10-08T18:51:32+00:00"
+ "time": "2024-12-30T11:07:19+00:00"
},
{
"name": "phar-io/manifest",
@@ -4209,16 +4217,16 @@
},
{
"name": "symfony/console",
- "version": "v7.2.0",
+ "version": "v7.2.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf"
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
- "reference": "23c8aae6d764e2bae02d2a99f7532a7f6ed619cf",
+ "url": "https://api.github.com/repos/symfony/console/zipball/fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
+ "reference": "fefcc18c0f5d0efe3ab3152f15857298868dc2c3",
"shasum": ""
},
"require": {
@@ -4282,7 +4290,7 @@
"terminal"
],
"support": {
- "source": "https://github.com/symfony/console/tree/v7.2.0"
+ "source": "https://github.com/symfony/console/tree/v7.2.1"
},
"funding": [
{
@@ -4298,7 +4306,7 @@
"type": "tidelift"
}
],
- "time": "2024-11-06T14:24:19+00:00"
+ "time": "2024-12-11T03:49:26+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -4319,12 +4327,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4631,8 +4639,8 @@
"type": "library",
"extra": {
"thanks": {
- "name": "symfony/polyfill",
- "url": "https://github.com/symfony/polyfill"
+ "url": "https://github.com/symfony/polyfill",
+ "name": "symfony/polyfill"
}
},
"autoload": {
@@ -4770,12 +4778,12 @@
},
"type": "library",
"extra": {
+ "thanks": {
+ "url": "https://github.com/symfony/contracts",
+ "name": "symfony/contracts"
+ },
"branch-alias": {
"dev-main": "3.5-dev"
- },
- "thanks": {
- "name": "symfony/contracts",
- "url": "https://github.com/symfony/contracts"
}
},
"autoload": {
@@ -4968,16 +4976,16 @@
},
{
"name": "yoast/phpunit-polyfills",
- "version": "1.1.2",
+ "version": "1.1.3",
"source": {
"type": "git",
"url": "https://github.com/Yoast/PHPUnit-Polyfills.git",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be"
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
- "reference": "e9c8413de4c8ae03d2923a44f17d0d7dad1b96be",
+ "url": "https://api.github.com/repos/Yoast/PHPUnit-Polyfills/zipball/0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
+ "reference": "0b31ce834facf03b8b44b6587e65b3cf1d7cfb94",
"shasum": ""
},
"require": {
@@ -5027,7 +5035,7 @@
"security": "https://github.com/Yoast/PHPUnit-Polyfills/security/policy",
"source": "https://github.com/Yoast/PHPUnit-Polyfills"
},
- "time": "2024-09-06T22:03:10+00:00"
+ "time": "2025-01-08T16:58:34+00:00"
}
],
"aliases": [],
diff --git a/projects/plugins/wpcomsh/woa.php b/projects/plugins/wpcomsh/woa.php
index b75df2dea8597..9bc9b64ffd4f5 100644
--- a/projects/plugins/wpcomsh/woa.php
+++ b/projects/plugins/wpcomsh/woa.php
@@ -250,18 +250,22 @@ function wpcomsh_woa_post_process_maybe_enable_wordads( $args, $assoc_args ) {
return;
}
+ // Set WordAds options.
foreach ( $options_decoded as $option => $value ) {
// Convert boolean options to string first to work around update_option not setting the option if the value is false.
// This sets the option to either '1' if true or '' if false.
update_option( $option, is_bool( $value ) ? (string) $value : $value );
}
- if ( ! defined( 'JETPACK__VERSION' ) || ! class_exists( 'Jetpack' ) ) {
- return;
- }
+ // Activate the WordAds module.
+ WP_CLI::runcommand(
+ 'jetpack module activate wordads',
+ array(
+ 'launch' => false,
+ 'exit_error' => false,
+ )
+ );
- if ( ! Jetpack::is_module_active( 'wordads' ) ) {
- Jetpack::activate_module( 'wordads', false, false );
- }
+ WP_CLI::success( 'WordAds options transferred and module activated' );
}
add_action( 'wpcomsh_woa_post_transfer', 'wpcomsh_woa_post_process_maybe_enable_wordads', 10, 2 );
diff --git a/tools/check-development-environment.sh b/tools/check-development-environment.sh
index 188c4323b66a6..b49ad737e646f 100755
--- a/tools/check-development-environment.sh
+++ b/tools/check-development-environment.sh
@@ -177,6 +177,10 @@ else
elif version_compare "$VER" "1.6"; then
success "ok (version $VER)"
JQOK=true
+ elif version_compare "$VER" "1.6-159-apple-gcff5336-dirty"; then
+ # As of macOS 10.15, Apple bundles a random version that should be good enough.
+ success "ok (version $VER)"
+ JQOK=true
else
failure "too old" '' "jq at $BIN is version $VER. Version 1.6 or later is required."
fi
diff --git a/tools/cli/commands/cli.js b/tools/cli/commands/cli.js
index 5810da97138f9..692079b2427c6 100644
--- a/tools/cli/commands/cli.js
+++ b/tools/cli/commands/cli.js
@@ -132,6 +132,12 @@ export function cliDefine( yargs ) {
'Symlink the CLI for global use or development.',
() => {},
argv => {
+ if ( process.env.JETPACK_MONOREPO_ENV ) {
+ console.log(
+ chalk.yellow( 'CLI linking is not needed within the monorepo container.' )
+ );
+ return;
+ }
cliLink( argv );
if ( argv.v ) {
console.log( argv );
@@ -143,6 +149,12 @@ export function cliDefine( yargs ) {
'Unlink the CLI.',
() => {},
argv => {
+ if ( process.env.JETPACK_MONOREPO_ENV ) {
+ console.log(
+ chalk.yellow( 'CLI unlinking is not needed within the monorepo container.' )
+ );
+ return;
+ }
cliUnlink( argv );
if ( argv.v ) {
console.log( argv );
diff --git a/tools/cli/commands/dependencies.js b/tools/cli/commands/dependencies.js
index 774b9063b64fa..14160b82b94be 100644
--- a/tools/cli/commands/dependencies.js
+++ b/tools/cli/commands/dependencies.js
@@ -24,6 +24,7 @@ infrastructureFileSets.test = new Set( [
'.github/files/coverage-munger/package.json',
'.github/files/coverage-munger/extract-php-summary-data.php',
'.github/files/coverage-munger/process-coverage.sh',
+ '.github/files/coverage-munger/upload-coverage.sh',
'.github/files/setup-wordpress-env.sh',
'.github/workflows/tests.yml',
] );
diff --git a/tools/cli/commands/docker.js b/tools/cli/commands/docker.js
index 938f3e8d25a19..0d46d986746a7 100644
--- a/tools/cli/commands/docker.js
+++ b/tools/cli/commands/docker.js
@@ -63,6 +63,13 @@ const buildEnv = argv => {
}
envOpts.COMPOSE_PROJECT_NAME = getProjectName( argv );
+
+ // Add versions from versions.sh
+ const versions = envfile.parse(
+ fs.readFileSync( `${ dockerFolder }/../../.github/versions.sh`, 'utf8' )
+ );
+ Object.assign( envOpts, versions );
+
return envOpts;
};
@@ -547,6 +554,15 @@ const execJtCmdHandler = argv => {
}
};
+/**
+ * Generate Docker configuration files.
+ *
+ * @param {object} argv - The command line arguments
+ */
+async function generateConfig( argv ) {
+ await setConfig( argv );
+}
+
/**
* Definition for the Docker commands.
*
@@ -554,7 +570,7 @@ const execJtCmdHandler = argv => {
* @return {object} Yargs with the Docker commands defined.
*/
export function dockerDefine( yargs ) {
- yargs.command( {
+ return yargs.command( {
command: 'docker ',
description: 'Docker stuff',
builder: yarg => {
@@ -801,9 +817,15 @@ export function dockerDefine( yargs ) {
command: 'jt-config',
description: 'Set jurassic tube config',
handler: argv => execJtCmdHandler( argv ),
+ } )
+ .command( {
+ command: 'config',
+ description: 'Generate Docker configuration files',
+ builder: yargCmd => defaultOpts( yargCmd ),
+ handler: async argv => {
+ await generateConfig( argv );
+ },
} );
},
} );
-
- return yargs;
}
diff --git a/tools/cli/commands/release.js b/tools/cli/commands/release.js
index 119b55ae6254a..b035061fb0db4 100644
--- a/tools/cli/commands/release.js
+++ b/tools/cli/commands/release.js
@@ -47,6 +47,10 @@ export function releaseDefine( yargs ) {
describe: 'Append the GH PR number to each entry',
type: 'boolean',
} )
+ .option( 'use-version', {
+ describe: 'Specify a version number explicitly',
+ type: 'string',
+ } )
.option( 'init-next-cycle', {
describe: 'For `version`, init the next release cycle',
type: 'boolean',
@@ -141,6 +145,9 @@ export async function scriptRouter( argv ) {
} else if ( argv.beta ) {
argv.scriptArgs.unshift( '-b' );
}
+ if ( argv.useVersion ) {
+ argv.scriptArgs.unshift( '-r', argv.useVersion );
+ }
argv.addPrNum && argv.scriptArgs.unshift( '-p' );
argv.next = `Finished! You may want to update the readme.txt by running 'jetpack release ${ argv.project } readme' \n`;
break;
@@ -162,6 +169,9 @@ export async function scriptRouter( argv ) {
argv.script = `vendor/bin/changelogger`;
argv.scriptArgs = [ `write`, `--amend` ];
argv.addPrNum && argv.scriptArgs.push( '--add-pr-num' );
+ if ( argv.useVersion ) {
+ argv.scriptArgs.push( '--use-version', argv.useVersion );
+ }
argv.workingDir = `projects/${ argv.project }`;
argv.next = `Finished! You will now likely want to update readme.txt again:
jetpack release ${ argv.project } readme \n`.replace( /^\t+/gm, '' );
@@ -246,9 +256,13 @@ export async function parseProj( argv ) {
* Get a potential version that we might need when creating a release branch or bumping versions.
*
* @param {object} argv - the arguments passed
- * @return {object} argv
+ * @return {string} Version
*/
export async function getReleaseVersion( argv ) {
+ if ( argv.useVersion ) {
+ return argv.useVersion;
+ }
+
let potentialVersion = child_process
.execSync( `tools/plugin-version.sh ${ argv.project }` )
.toString()
diff --git a/tools/cli/skeletons/packages/src/class-example.php b/tools/cli/skeletons/packages/src/class-example.php
index f115f673f1c82..659d369e5e1e3 100644
--- a/tools/cli/skeletons/packages/src/class-example.php
+++ b/tools/cli/skeletons/packages/src/class-example.php
@@ -12,6 +12,6 @@
*/
class Package_Name {
- const PACKAGE_VERSION = '1.0.0-alpha';
+ const PACKAGE_VERSION = '0.1.0-alpha';
}
diff --git a/tools/cli/skeletons/plugins/plugin.php b/tools/cli/skeletons/plugins/plugin.php
index a0655341c7f1a..c1353bca9574f 100644
--- a/tools/cli/skeletons/plugins/plugin.php
+++ b/tools/cli/skeletons/plugins/plugin.php
@@ -4,7 +4,7 @@
* Plugin Name: TBD
* Plugin URI: TBD
* Description: TBD
- * Version: 1.0.0-alpha
+ * Version: 0.1.0-alpha
* Author: Automattic
* Author URI: https://jetpack.com/
* License: GPLv2 or later
diff --git a/tools/docker/Dockerfile.monorepo b/tools/docker/Dockerfile.monorepo
new file mode 100644
index 0000000000000..7d9bc62343575
--- /dev/null
+++ b/tools/docker/Dockerfile.monorepo
@@ -0,0 +1,91 @@
+FROM ubuntu:24.04
+
+# Import version variables from .github/versions.sh
+ARG PHP_VERSION
+ARG COMPOSER_VERSION
+ARG NODE_VERSION
+ARG PNPM_VERSION
+
+ENV LANG=en_US.UTF-8 \
+ LC_ALL=en_US.UTF-8 \
+ JETPACK_MONOREPO_ENV=1
+
+WORKDIR /app
+
+# Install basic packages and PHP
+RUN --mount=type=cache,target=/var/lib/apt/lists/,sharing=private \
+ export DEBIAN_FRONTEND=noninteractive \
+ && apt-get update \
+ && apt-get install -y curl gpg language-pack-en-base software-properties-common ca-certificates \
+ && add-apt-repository ppa:ondrej/php \
+ && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+ # Add Docker's official GPG key
+ && install -m 0755 -d /etc/apt/keyrings \
+ && curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc \
+ && chmod a+r /etc/apt/keyrings/docker.asc \
+ # Add Docker repository
+ && echo \
+ "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+ $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+ tee /etc/apt/sources.list.d/docker.list > /dev/null \
+ && apt-get update \
+ && apt-get --purge install -y \
+ git \
+ unzip \
+ zip \
+ docker-ce-cli \
+ docker-buildx-plugin \
+ docker-compose-plugin \
+ jq \
+ "php${PHP_VERSION}" \
+ "php${PHP_VERSION}-cli" \
+ "php${PHP_VERSION}-curl" \
+ "php${PHP_VERSION}-dom" \
+ "php${PHP_VERSION}-mbstring" \
+ "php${PHP_VERSION}-xml" \
+ "php${PHP_VERSION}-zip" \
+ rsync \
+ && apt-get remove --purge --auto-remove -y gpg software-properties-common \
+ && find /var/ -name '*-old' -delete && rm -rf /var/log/dpkg.log /var/log/alternatives.log /var/log/apt/ ~/.launchpadlib
+
+# Install Composer
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+ && php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=$COMPOSER_VERSION \
+ && php -r "unlink('composer-setup.php');"
+
+# Install Node.js
+RUN --mount=type=cache,target=/var/lib/apt/lists/,sharing=private \
+ export DEBIAN_FRONTEND=noninteractive \
+ && N=${NODE_VERSION%%.*} \
+ && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$N.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \
+ && apt-get -q update \
+ && VER="$(apt-cache show nodejs | sed -n "/^Version: ${NODE_VERSION}-/ { s/^Version: /=/p; q }" )" \
+ && apt-get install -y nodejs$VER
+
+# Install pnpm
+RUN npm install --global pnpm@$PNPM_VERSION \
+ && SHELL=/bin/bash pnpm setup
+
+WORKDIR /workspace
+
+# Add entrypoint script
+COPY bin/monorepo-entrypoint.sh /usr/local/bin/
+RUN chmod +x /usr/local/bin/monorepo-entrypoint.sh
+
+# Set up locale properly
+RUN apt-get update && apt-get install -y locales \
+ && locale-gen en_US.UTF-8 \
+ && update-locale LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
+
+ENV LANG=en_US.UTF-8
+ENV LC_ALL=en_US.UTF-8
+
+# Set up PNPM global directory
+ENV PNPM_HOME=/usr/local/pnpm
+ENV PATH="${PNPM_HOME}:${PATH}"
+
+RUN mkdir -p "$PNPM_HOME" \
+ && chmod 777 "$PNPM_HOME"
+
+ENTRYPOINT ["/usr/local/bin/monorepo-entrypoint.sh"]
+CMD ["bash"]
diff --git a/tools/docker/bin/monorepo b/tools/docker/bin/monorepo
new file mode 100755
index 0000000000000..8a6cc39d39c8d
--- /dev/null
+++ b/tools/docker/bin/monorepo
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+# Enable debug mode if DEBUG environment variable is set
+if [ "${DEBUG:-}" = "1" ]; then
+ set -x
+fi
+
+# Get the absolute path to the monorepo root
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+MONOREPO_ROOT="$( cd "$SCRIPT_DIR/../../.." && pwd )"
+
+echo "Running command in monorepo container: $*"
+
+# Source the versions file
+source "$MONOREPO_ROOT/.github/versions.sh"
+
+# Export variables needed by docker-compose
+export HOST_CWD="$MONOREPO_ROOT"
+
+# Build the image if it doesn't exist
+if ! docker image inspect jetpack-monorepo:latest >/dev/null 2>&1; then
+ if [ "${BUILD_LOCAL:-}" = "1" ]; then
+ echo "Building monorepo image locally..."
+ docker build \
+ --build-arg PHP_VERSION="$PHP_VERSION" \
+ --build-arg COMPOSER_VERSION="$COMPOSER_VERSION" \
+ --build-arg NODE_VERSION="$NODE_VERSION" \
+ --build-arg PNPM_VERSION="$PNPM_VERSION" \
+ -t jetpack-monorepo:latest \
+ -f "$MONOREPO_ROOT/tools/docker/Dockerfile.monorepo" \
+ "$MONOREPO_ROOT/tools/docker"
+ else
+ echo "Pulling monorepo image..."
+ docker pull automattic/jetpack-monorepo:latest
+ docker tag automattic/jetpack-monorepo:latest jetpack-monorepo:latest
+ fi
+fi
+
+# Run the command in the container
+docker run --rm -it \
+ -v "$MONOREPO_ROOT:/workspace" \
+ -v "$MONOREPO_ROOT/tools/docker/data/monorepo:/root" \
+ -v /var/run/docker.sock:/var/run/docker.sock \
+ -w /workspace \
+ -e TERM=$TERM \
+ -e COLORTERM=$COLORTERM \
+ -e DOCKER_ROOT="$MONOREPO_ROOT/tools/docker" \
+ -e HOST_CWD="$MONOREPO_ROOT" \
+ -e WORKSPACE_PATH="$MONOREPO_ROOT" \
+ -e NPM_CONFIG_USERCONFIG=/root/.npmrc \
+ -e NPM_CONFIG_CACHE=/root/.npm \
+ -e PNPM_HOME=/root/.local/share/pnpm \
+ -e PNPM_STORE_DIR=/root/.pnpm-store \
+ jetpack-monorepo:latest \
+ "$@"
diff --git a/tools/docker/bin/monorepo-entrypoint.sh b/tools/docker/bin/monorepo-entrypoint.sh
new file mode 100644
index 0000000000000..262b10b292298
--- /dev/null
+++ b/tools/docker/bin/monorepo-entrypoint.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Exit on error
+set -e
+
+# Check and set PNPM store location
+EXPECTED_STORE="/workspace/tools/docker/data/pnpm-store"
+CURRENT_STORE=$(pnpm config get store-dir)
+
+if [ "$CURRENT_STORE" != "$EXPECTED_STORE" ]; then
+ echo "Setting PNPM store directory to $EXPECTED_STORE"
+ mkdir -p "$EXPECTED_STORE"
+ pnpm config set store-dir "$EXPECTED_STORE"
+fi
+
+# Check if jetpack command is available
+if ! pnpm jetpack --help &>/dev/null; then
+ echo "Setting up Jetpack CLI..."
+ pnpm install
+fi
+
+# Execute the passed command
+exec "$@"
diff --git a/tools/eslint-excludelist.json b/tools/eslint-excludelist.json
index 351b4d8ab26fa..159becca965db 100644
--- a/tools/eslint-excludelist.json
+++ b/tools/eslint-excludelist.json
@@ -1,7 +1,6 @@
[
"projects/plugins/jetpack/_inc/client/components/global-notices/state/notices/actions.js",
"projects/plugins/jetpack/_inc/client/components/global-notices/state/notices/reducer.js",
- "projects/plugins/jetpack/_inc/client/components/jetpack-notices/plan-conflict-warning.jsx",
"projects/plugins/jetpack/_inc/client/components/modal/index.jsx",
"projects/plugins/jetpack/_inc/client/components/popover/util.js",
"projects/plugins/jetpack/_inc/client/config.js",
diff --git a/tools/js-tools/git-hooks/pre-commit-hook.mjs b/tools/js-tools/git-hooks/pre-commit-hook.mjs
index bd7e0073ead50..ab98a7046d384 100644
--- a/tools/js-tools/git-hooks/pre-commit-hook.mjs
+++ b/tools/js-tools/git-hooks/pre-commit-hook.mjs
@@ -439,7 +439,7 @@ function runCheckGitHubActionsYamlFiles() {
return;
}
- const result = spawnSync( './tools/js-tools/lint-gh-actions.js', files, {
+ const result = spawnSync( './tools/js-tools/lint-gh-actions.mjs', files, {
stdio: 'inherit',
} );
if ( result && result.status ) {
diff --git a/tools/js-tools/lint-gh-actions.js b/tools/js-tools/lint-gh-actions.mjs
similarity index 97%
rename from tools/js-tools/lint-gh-actions.js
rename to tools/js-tools/lint-gh-actions.mjs
index 2e89b66b32d27..1aa82d5220f84 100755
--- a/tools/js-tools/lint-gh-actions.js
+++ b/tools/js-tools/lint-gh-actions.mjs
@@ -2,10 +2,10 @@
/* eslint-env node */
-const fs = require( 'fs' );
-const chalk = require( 'chalk' );
-const { glob } = require( 'glob' );
-const YAML = require( 'yaml' );
+import fs from 'fs';
+import chalk from 'chalk';
+import { glob } from 'glob';
+import YAML from 'yaml';
const isCI = !! process.env.CI;
diff --git a/tools/phpcs-excludelist.json b/tools/phpcs-excludelist.json
index 7b911cb34a937..b4414dcbda76f 100644
--- a/tools/phpcs-excludelist.json
+++ b/tools/phpcs-excludelist.json
@@ -157,7 +157,6 @@
"projects/plugins/crm/includes/ZeroBSCRM.OnboardMe.php",
"projects/plugins/crm/includes/ZeroBSCRM.PerformanceTesting.php",
"projects/plugins/crm/includes/ZeroBSCRM.Permissions.php",
- "projects/plugins/crm/includes/ZeroBSCRM.PluginAdminNotices.php",
"projects/plugins/crm/includes/ZeroBSCRM.PluginUpdates.ImminentRelease.php",
"projects/plugins/crm/includes/ZeroBSCRM.PluginUpdates.php",
"projects/plugins/crm/includes/ZeroBSCRM.REST.php",
| | |