diff --git a/projects/packages/forms/src/blocks/contact-form/util/caret.js b/projects/packages/forms/src/blocks/contact-form/util/caret.js
index a5748ff3cd88b..253f0498d235d 100644
--- a/projects/packages/forms/src/blocks/contact-form/util/caret.js
+++ b/projects/packages/forms/src/blocks/contact-form/util/caret.js
@@ -20,3 +20,24 @@ export const getCaretPosition = target => {
return preCaretRange.toString().length;
};
+
+/**
+ * Move the caret position in an active contenteditable element to the end
+ *
+ * @param {HTMLElement} target - Contenteditable element of which to move the caret
+ */
+export const moveCaretToEnd = target => {
+ if ( 'undefined' === typeof window ) {
+ return;
+ }
+
+ // Add the contenteditable element to a new selection and collapse it to the end
+ const range = document.createRange();
+ range.selectNodeContents( target );
+ range.collapse( false );
+
+ // Clear the window selection object and add the new selection
+ const selection = window.getSelection();
+ selection.removeAllRanges();
+ selection.addRange( range );
+};
diff --git a/projects/packages/image-cdn/CHANGELOG.md b/projects/packages/image-cdn/CHANGELOG.md
index 81868c8b93be7..b658e82aba942 100644
--- a/projects/packages/image-cdn/CHANGELOG.md
+++ b/projects/packages/image-cdn/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.7] - 2024-08-29
+### Changed
+- Rely on WordPress HTML API to parse HTML instead of Regex [#32700]
+
## [0.4.6] - 2024-08-26
### Changed
- Updated package dependencies. [#39004]
@@ -114,6 +118,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Add image CDN package. [#29561]
+[0.4.7]: https://github.com/Automattic/jetpack-image-cdn/compare/v0.4.6...v0.4.7
[0.4.6]: https://github.com/Automattic/jetpack-image-cdn/compare/v0.4.5...v0.4.6
[0.4.5]: https://github.com/Automattic/jetpack-image-cdn/compare/v0.4.4...v0.4.5
[0.4.4]: https://github.com/Automattic/jetpack-image-cdn/compare/v0.4.3...v0.4.4
diff --git a/projects/packages/image-cdn/src/class-image-cdn.php b/projects/packages/image-cdn/src/class-image-cdn.php
index 2aa47aeada031..13921df4355a9 100644
--- a/projects/packages/image-cdn/src/class-image-cdn.php
+++ b/projects/packages/image-cdn/src/class-image-cdn.php
@@ -12,7 +12,7 @@
*/
final class Image_CDN {
- const PACKAGE_VERSION = '0.4.6';
+ const PACKAGE_VERSION = '0.4.7';
/**
* Singleton.
@@ -333,297 +333,360 @@ public static function parse_dimensions_from_filename( $src ) {
* @return string
*/
public static function filter_the_content( $content ) {
- $images = self::parse_images_from_html( $content );
+ static $image_tags = array( 'IMG', 'AMP-IMG', 'AMP-ANIM' );
+ $content_width = null;
+ $image_sizes = null;
+ $upload_dir = null;
+ $processor = new \WP_HTML_Tag_Processor( $content );
+ $nearest_preceding_href = null;
+
+ // Visit every image-containing tag in the document.
+ while ( $processor->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
+ /*
+ * When an image is wrapped by an A element, the goal is to modify
+ * both elements. Thus it's important to track links that may be
+ * opened before reaching any image. In normative HTML this detection
+ * is reliable enough, but it could be confused in cases where other
+ * tags implicitly close the A. If this additional reliability is
+ * required, replace the Tag Processor with the HTML Processor.
+ */
+ if ( 'A' === $processor->get_tag() ) {
+ // If this is a closing tag the attribute will be `null`.
+ $nearest_preceding_href = $processor->get_attribute( 'href' );
+ $processor->set_bookmark( 'link' );
+ continue;
+ }
- if ( ! empty( $images ) ) {
- $content_width = Image_CDN_Core::get_jetpack_content_width();
+ /*
+ * Only examine tags that are considered an image. If encountering
+ * a closing tag then this is not the image being sought.
+ */
+ if ( $processor->is_tag_closer() || ! in_array( $processor->get_tag(), $image_tags, true ) ) {
+ continue;
+ }
- $image_sizes = self::image_sizes();
+ $processor->set_bookmark( 'image' );
- $upload_dir = wp_get_upload_dir();
+ /*
+ * At this point a target image has been found. Initialize the
+ * shared data and then process each image as it appears.
+ */
+ if ( null === $content_width ) {
+ $content_width = Image_CDN_Core::get_jetpack_content_width();
+ $image_sizes = self::image_sizes();
+ $upload_dir = wp_get_upload_dir();
+ }
- foreach ( $images[0] as $index => $tag ) {
- // Default to resize, though fit may be used in certain cases where a dimension cannot be ascertained.
- $transform = 'resize';
+ /*
+ * To preserve legacy behaviors for filtering by third-party plugins,
+ * create a normalized HTML string representing the tag. This will
+ * present all attributes as double-quoted attributes and include at
+ * most one copy of each attribute, escaping all values appropriately.
+ */
+ $tag_name = strtolower( $processor->get_tag() );
+ $tag = new \WP_HTML_Tag_Processor( "<{$tag_name}>" );
+ $tag->next_tag();
+ foreach ( $processor->get_attribute_names_with_prefix( '' ) ?? array() as $name ) {
+ $tag->set_attribute( $name, $processor->get_attribute( $name ) );
+ }
+ $tag = $tag->get_updated_html();
- // Start with a clean attachment ID each time.
- $attachment_id = false;
+ // Default to resize, though fit may be used in certain cases where a dimension cannot be ascertained.
+ $transform = 'resize';
- // Flag if we need to munge a fullsize URL.
- $fullsize_url = false;
+ // Flag if we need to munge a fullsize URL.
+ $fullsize_url = false;
- // Identify image source.
- $src_orig = $images['img_url'][ $index ];
- $src = $src_orig;
+ // Identify image source.
+ $src_orig = $processor->get_attribute( 'src' );
+ $src = $src_orig;
- /**
- * Allow specific images to be skipped by Photon.
- *
- * @module photon
- *
- * @since 2.0.3
- *
- * @param bool false Should Photon ignore this image. Default to false.
- * @param string $src Image URL.
- * @param string|array|null $tag Image Tag (Image HTML output) or array of image details for srcset.
- */
- if ( apply_filters( 'jetpack_photon_skip_image', false, $src, $tag ) ) {
- continue;
- }
-
- // Support Automattic's Lazy Load plugin.
- // Can't modify $tag yet as we need unadulterated version later.
- if ( preg_match( '#data-lazy-src=["\'](.+?)["\']#i', $images['img_tag'][ $index ], $lazy_load_src ) ) {
- $placeholder_src_orig = $src;
- $placeholder_src = $placeholder_src_orig;
- $src_orig = $lazy_load_src[1];
- $src = $src_orig;
- } elseif ( preg_match( '#data-lazy-original=["\'](.+?)["\']#i', $images['img_tag'][ $index ], $lazy_load_src ) ) {
- $placeholder_src_orig = $src;
- $placeholder_src = $placeholder_src_orig;
- $src_orig = $lazy_load_src[1];
- $src = $src_orig;
- }
-
- // Check if image URL should be used with Photon.
- if ( self::validate_image_url( $src ) ) {
- // Find the width and height attributes.
- $width = false;
- $height = false;
-
- // First, check the image tag. Note we only check for pixel sizes now; HTML4 percentages have never been correctly
- // supported, so we stopped pretending to support them in JP 9.1.0.
- if ( preg_match( '#[\s"\']width=["\']?([\d%]+)["\']?#i', $images['img_tag'][ $index ], $width_string ) ) {
- $width = str_contains( $width_string[1], '%' ) ? false : $width_string[1];
- }
+ /**
+ * Allow specific images to be skipped by Photon.
+ *
+ * @module photon
+ *
+ * @since 2.0.3
+ *
+ * @param bool false Should Photon ignore this image. Default to false.
+ * @param string $src Image URL.
+ * @param string|array|null $tag Image Tag (Image HTML output) or array of image details for srcset.
+ */
+ if ( apply_filters( 'jetpack_photon_skip_image', false, $src, $tag ) ) {
+ continue;
+ }
- if ( preg_match( '#[\s"\']height=["\']?([\d%]+)["\']?#i', $images['img_tag'][ $index ], $height_string ) ) {
- $height = str_contains( $height_string[1], '%' ) ? false : $height_string[1];
- }
+ $data_lazy_src = $processor->get_attribute( 'data-lazy-src' );
+ $data_lazy_original = $processor->get_attribute( 'data-lazy-original' );
- // Detect WP registered image size from HTML class.
- if ( preg_match( '#class=["\']?[^"\']*size-([^"\'\s]+)[^"\']*["\']?#i', $images['img_tag'][ $index ], $size ) ) {
- $size = array_pop( $size );
+ $source_type = 'src';
+ $chosen_data_src = null;
- if ( false === $width && false === $height && 'full' !== $size && array_key_exists( $size, $image_sizes ) ) {
- $width = (int) $image_sizes[ $size ]['width'];
- $height = (int) $image_sizes[ $size ]['height'];
- $transform = $image_sizes[ $size ]['crop'] ? 'resize' : 'fit';
- }
- } else {
- unset( $size );
- }
+ // Prefer a URL from the `data-lazy-src` attribute.
+ if ( null === $chosen_data_src && is_string( $data_lazy_src ) && ! empty( $data_lazy_src ) ) {
+ $source_type = 'data-lazy-src';
+ $chosen_data_src = $data_lazy_src;
+ }
- // WP Attachment ID, if uploaded to this site.
- if (
- preg_match( '#class=["\']?[^"\']*wp-image-([\d]+)[^"\']*["\']?#i', $images['img_tag'][ $index ], $attachment_id ) &&
- str_starts_with( $src, $upload_dir['baseurl'] ) &&
- /**
- * Filter whether an image using an attachment ID in its class has to be uploaded to the local site to go through Photon.
- *
- * @module photon
- *
- * @since 2.0.3
- *
- * @param bool false Was the image uploaded to the local site. Default to false.
- * @param array $args {
- * Array of image details.
- *
- * @type $src Image URL.
- * @type tag Image tag (Image HTML output).
- * @type $images Array of information about the image.
- * @type $index Image index.
- * }
- */
- apply_filters( 'jetpack_photon_image_is_local', false, compact( 'src', 'tag', 'images', 'index' ) )
- ) {
- $attachment_id = (int) array_pop( $attachment_id );
-
- if ( $attachment_id ) {
- $attachment = get_post( $attachment_id );
-
- // Basic check on returned post object.
- if ( is_object( $attachment ) && ! is_wp_error( $attachment ) && 'attachment' === $attachment->post_type ) {
- $src_per_wp = wp_get_attachment_image_src( $attachment_id, isset( $size ) ? $size : 'full' );
-
- if ( self::validate_image_url( $src_per_wp[0] ) ) {
- $src = $src_per_wp[0];
- $fullsize_url = true;
-
- // Prevent image distortion if a detected dimension exceeds the image's natural dimensions.
- if ( ( false !== $width && $width > $src_per_wp[1] ) || ( false !== $height && $height > $src_per_wp[2] ) ) {
- $width = false === $width ? false : min( $width, $src_per_wp[1] );
- $height = false === $height ? false : min( $height, $src_per_wp[2] );
- }
-
- // If no width and height are found, max out at source image's natural dimensions.
- // Otherwise, respect registered image sizes' cropping setting.
- if ( false === $width && false === $height ) {
- $width = $src_per_wp[1];
- $height = $src_per_wp[2];
- $transform = 'fit';
- } elseif ( isset( $size ) && array_key_exists( $size, $image_sizes ) && isset( $image_sizes[ $size ]['crop'] ) ) {
- $transform = (bool) $image_sizes[ $size ]['crop'] ? 'resize' : 'fit';
- }
- }
- } else {
- unset( $attachment_id );
- unset( $attachment );
- }
- }
- }
+ // Fall back to a URL from the `data-lazy-original` attribute.
+ if ( null === $chosen_data_src && is_string( $data_lazy_original ) && ! empty( $data_lazy_original ) ) {
+ $source_type = 'data-lazy-original';
+ $chosen_data_src = $data_lazy_original;
+ }
- // If image tag lacks width and height arguments, try to determine from strings WP appends to resized image filenames.
- if ( false === $width && false === $height ) {
- list( $width, $height ) = self::parse_dimensions_from_filename( $src );
- }
+ // Update the src if one was provided in the `data-lazy-` attributes.
+ if ( 'src' !== $source_type ) {
+ $placeholder_src_orig = $src;
+ $placeholder_src = $placeholder_src_orig;
+ $src_orig = $chosen_data_src;
+ $src = $src_orig;
+ }
- $width_orig = $width;
- $height_orig = $height;
- $transform_orig = $transform;
+ // Check if image URL should be used with Photon.
+ if ( self::validate_image_url( $src ) ) {
+ $width = $processor->get_attribute( 'width' );
+ $height = $processor->get_attribute( 'height' );
+
+ // First, check the image tag. Note we only check for pixel sizes now; HTML4 percentages have never been correctly
+ // supported, so we stopped pretending to support them in JP 9.1.0.
+ if ( ! is_string( $width ) || str_contains( $width, '%' ) ) {
+ $width = false;
+ }
- // If width is available, constrain to $content_width.
- if ( false !== $width && is_numeric( $content_width ) && $width > $content_width ) {
- if ( false !== $height ) {
- $height = round( ( $content_width * $height ) / $width );
- }
- $width = $content_width;
- }
+ if ( ! is_string( $height ) || str_contains( $height, '%' ) ) {
+ $height = false;
+ }
- // Set a width if none is found and $content_width is available.
- // If width is set in this manner and height is available, use `fit` instead of `resize` to prevent skewing.
- if ( false === $width && is_numeric( $content_width ) ) {
- $width = (int) $content_width;
+ $needs_sizing = false === $width && false === $height;
+ $size = null;
- if ( false !== $height ) {
- $transform = 'fit';
+ if ( $needs_sizing ) {
+ // Find the first CSS class listed with a prefix of `size-`, e.g. `size-full-width`
+ foreach ( $processor->class_list() ?? array() as $class_name ) {
+ if ( str_starts_with( $class_name, 'size-' ) ) {
+ $size = substr( $class_name, strlen( 'size-' ) );
+ break;
}
}
+ }
- // Detect if image source is for a custom-cropped thumbnail and prevent further URL manipulation.
- if ( ! $fullsize_url && preg_match_all( '#-e[a-z0-9]+(-\d+x\d+)?\.(' . implode( '|', self::$extensions ) . '){1}$#i', basename( $src ), $filename ) ) {
- $fullsize_url = true;
- }
-
- // Build URL, first maybe removing WP's resized string so we pass the original image to Photon.
- if ( ! $fullsize_url && str_starts_with( $src, $upload_dir['baseurl'] ) ) {
- $src = self::strip_image_dimensions_maybe( $src );
- }
-
- // Build array of Photon args and expose to filter before passing to Photon URL function.
- $args = array();
+ if ( $needs_sizing && 'full' !== $size && is_string( $size ) && isset( $image_sizes[ $size ] ) && is_array( $image_sizes[ $size ] ) ) {
+ $width = (int) $image_sizes[ $size ]['width'];
+ $height = (int) $image_sizes[ $size ]['height'];
+ $transform = $image_sizes[ $size ]['crop'] ? 'resize' : 'fit';
+ } else {
+ unset( $size );
+ }
- if ( false !== $width && false !== $height ) {
- $args[ $transform ] = $width . ',' . $height;
- } elseif ( false !== $width ) {
- $args['w'] = $width;
- } elseif ( false !== $height ) {
- $args['h'] = $height;
+ // WP Attachment ID, if uploaded to this site.
+ $attachment_id = null;
+ foreach ( $processor->class_list() ?? array() as $class_name ) {
+ if ( str_starts_with( $class_name, 'wp-image-' ) ) {
+ $attachment_id = substr( $class_name, strlen( 'wp-image-' ) );
+ break;
}
+ }
+ // These values have not been used for a very long time, but removing them could break something.
+ $images = array();
+ $index = 0;
+ if (
+ $attachment_id &&
+ preg_match( '#^[1-9][0-9]*$#', $attachment_id ) &&
+ is_array( $upload_dir ) &&
+ str_starts_with( $src, $upload_dir['baseurl'] ) &&
/**
- * Filter the array of Photon arguments added to an image when it goes through Photon.
- * By default, only includes width and height values.
- *
- * @see https://developer.wordpress.com/docs/photon/api/
+ * Filter whether an image using an attachment ID in its class has to be uploaded to the local site to go through Photon.
*
* @module photon
*
- * @since 2.0.0
+ * @since 2.0.3
*
- * @param array $args Array of Photon Arguments.
- * @param array $details {
- * Array of image details.
+ * @param bool false Was the image uploaded to the local site. Default to false.
+ * @param array $args {
+ * Array of image details.
*
- * @type string $tag Image tag (Image HTML output).
- * @type string $src Image URL.
- * @type string $src_orig Original Image URL.
- * @type int|false $width Image width.
- * @type int|false $height Image height.
- * @type int|false $width_orig Original image width before constrained by content_width.
- * @type int|false $height_orig Original Image height before constrained by content_width.
- * @type string $transform Transform.
- * @type string $transform_orig Original transform before constrained by content_width.
+ * @type $src Image URL.
+ * @type tag Image tag (Image HTML output).
* }
*/
- $args = apply_filters( 'jetpack_photon_post_image_args', $args, compact( 'tag', 'src', 'src_orig', 'width', 'height', 'width_orig', 'height_orig', 'transform', 'transform_orig' ) );
+ apply_filters( 'jetpack_photon_image_is_local', false, compact( 'src', 'tag', 'images', 'index' ) )
+ ) {
+ $attachment_id = (int) $attachment_id;
+ $attachment = get_post( $attachment_id );
+
+ // Basic check on returned post object.
+ if ( is_object( $attachment ) && ! is_wp_error( $attachment ) && 'attachment' === $attachment->post_type ) {
+ $src_per_wp = wp_get_attachment_image_src( $attachment_id, isset( $size ) ? $size : 'full' );
+
+ if ( self::validate_image_url( $src_per_wp[0] ) ) {
+ $src = $src_per_wp[0];
+ $fullsize_url = true;
+
+ // Prevent image distortion if a detected dimension exceeds the image's natural dimensions.
+ if ( ( false !== $width && $width > $src_per_wp[1] ) || ( false !== $height && $height > $src_per_wp[2] ) ) {
+ $width = false === $width ? false : min( $width, $src_per_wp[1] );
+ $height = false === $height ? false : min( $height, $src_per_wp[2] );
+ }
- $photon_url = Image_CDN_Core::cdn_url( $src, $args );
+ // If no width and height are found, max out at source image's natural dimensions.
+ // Otherwise, respect registered image sizes' cropping setting.
+ if ( false === $width && false === $height ) {
+ $width = $src_per_wp[1];
+ $height = $src_per_wp[2];
+ $transform = 'fit';
+ } elseif ( isset( $size ) && is_array( $image_sizes ) && array_key_exists( $size, $image_sizes ) && isset( $image_sizes[ $size ]['crop'] ) ) {
+ $transform = $image_sizes[ $size ]['crop'] ? 'resize' : 'fit';
+ }
+ }
+ } else {
+ unset( $attachment_id );
+ unset( $attachment );
+ }
+ }
- // Modify image tag if Photon function provides a URL
- // Ensure changes are only applied to the current image by copying and modifying the matched tag, then replacing the entire tag with our modified version.
- if ( $src !== $photon_url ) {
- $new_tag = $tag;
+ // If image tag lacks width and height arguments, try to determine from strings WP appends to resized image filenames.
+ if ( false === $width && false === $height ) {
+ list( $width, $height ) = self::parse_dimensions_from_filename( $src );
+ }
- // If present, replace the link href with a Photoned URL for the full-size image.
- if ( ! empty( $images['link_url'][ $index ] ) && self::validate_image_url( $images['link_url'][ $index ] ) ) {
- $new_tag = preg_replace( '#(href=["|\'])' . preg_quote( $images['link_url'][ $index ], '#' ) . '(["|\'])#i', '\1' . Image_CDN_Core::cdn_url( $images['link_url'][ $index ] ) . '\2', $new_tag, 1 );
- }
+ $width_orig = $width;
+ $height_orig = $height;
+ $transform_orig = $transform;
- // Supplant the original source value with our Photon URL.
- $photon_url = esc_url( $photon_url );
- $new_tag = str_replace( $src_orig, $photon_url, $new_tag );
+ // If width is available, constrain to $content_width.
+ if ( false !== $width && is_numeric( $content_width ) && $width > $content_width ) {
+ if ( false !== $height ) {
+ $height = round( ( $content_width * $height ) / $width );
+ }
+ $width = $content_width;
+ }
- // If Lazy Load is in use, pass placeholder image through Photon.
- if ( isset( $placeholder_src ) && self::validate_image_url( $placeholder_src ) ) {
- $placeholder_src = Image_CDN_Core::cdn_url( $placeholder_src );
+ // Set a width if none is found and $content_width is available.
+ // If width is set in this manner and height is available, use `fit` instead of `resize` to prevent skewing.
+ if ( false === $width && is_numeric( $content_width ) ) {
+ $width = (int) $content_width;
- if ( $placeholder_src !== $placeholder_src_orig ) {
- $new_tag = str_replace( $placeholder_src_orig, esc_url( $placeholder_src ), $new_tag );
- }
+ if ( false !== $height ) {
+ $transform = 'fit';
+ }
+ }
- unset( $placeholder_src );
- }
+ // Detect if image source is for a custom-cropped thumbnail and prevent further URL manipulation.
+ if ( ! $fullsize_url && preg_match_all( '#-e[a-z0-9]+(-\d+x\d+)?\.(' . implode( '|', self::$extensions ) . '){1}$#i', basename( $src ), $filename ) ) {
+ $fullsize_url = true;
+ }
- // If we are not transforming the image with resize, fit, or letterbox (lb), then we should remove
- // the width and height arguments (including HTML4 percentages) from the image to prevent distortion.
- // Even if $args['w'] and $args['h'] are present, Photon does not crop to those dimensions. Instead,
- // it appears to favor height.
- //
- // If we are transforming the image via one of those methods, let's update the width and height attributes.
- if ( empty( $args['resize'] ) && empty( $args['fit'] ) && empty( $args['lb'] ) ) {
- $new_tag = preg_replace( '#(?<=\s)(width|height)=["\']?[\d%]+["\']?\s?#i', '', $new_tag );
- } else {
- $resize_args = isset( $args['resize'] ) ? $args['resize'] : false;
- if ( false === $resize_args ) {
- $resize_args = ( ! $resize_args && isset( $args['fit'] ) )
- ? $args['fit']
- : false;
- }
- if ( false === $resize_args ) {
- $resize_args = ( ! $resize_args && isset( $args['lb'] ) )
- ? $args['lb']
- : false;
- }
+ // Build URL, first maybe removing WP's resized string so we pass the original image to Photon.
+ if ( ! $fullsize_url && is_array( $upload_dir ) && str_starts_with( $src, $upload_dir['baseurl'] ) ) {
+ $src = self::strip_image_dimensions_maybe( $src );
+ }
+
+ // Build array of Photon args and expose to filter before passing to Photon URL function.
+ $args = array();
+
+ if ( false !== $width && false !== $height ) {
+ $args[ $transform ] = $width . ',' . $height;
+ } elseif ( false !== $width ) {
+ $args['w'] = $width;
+ } elseif ( false !== $height ) {
+ $args['h'] = $height;
+ }
+
+ /**
+ * Filter the array of Photon arguments added to an image when it goes through Photon.
+ * By default, only includes width and height values.
+ *
+ * @see https://developer.wordpress.com/docs/photon/api/
+ *
+ * @module photon
+ *
+ * @since 2.0.0
+ * @since 0.4.7 Passes image tag name instead of full HTML of tag.
+ *
+ * @param array $args Array of Photon Arguments.
+ * @param array $details {
+ * Array of image details.
+ *
+ * @type string $tag Image tag (Image HTML output).
+ * @type string $src Image URL.
+ * @type string $src_orig Original Image URL.
+ * @type int|false $width Image width.
+ * @type int|false $height Image height.
+ * @type int|false $width_orig Original image width before constrained by content_width.
+ * @type int|false $height_orig Original Image height before constrained by content_width.
+ * @type string $transform Transform.
+ * @type string $transform_orig Original transform before constrained by content_width.
+ * }
+ */
+ $args = apply_filters( 'jetpack_photon_post_image_args', $args, compact( 'tag', 'src', 'src_orig', 'width', 'height', 'width_orig', 'height_orig', 'transform', 'transform_orig' ) );
+
+ $photon_url = Image_CDN_Core::cdn_url( $src, $args );
+
+ // Modify image tag if Photon function provides a URL
+ // Ensure changes are only applied to the current image by copying and modifying the matched tag, then replacing the entire tag with our modified version.
+ if ( $src !== $photon_url ) {
+ // If present, replace the link href with a Photoned URL for the full-size image.
+ if ( is_string( $nearest_preceding_href ) && self::validate_image_url( $nearest_preceding_href ) ) {
+ $processor->seek( 'link' );
+ $processor->set_attribute( 'href', Image_CDN_Core::cdn_url( $nearest_preceding_href ) );
+ $processor->seek( 'image' );
+ }
+
+ // Supplant the original source value with our Photon URL.
+ $processor->set_attribute( 'src', $photon_url );
- $resize_args = array_map( 'trim', explode( ',', $resize_args ) );
+ // If Lazy Load is in use, pass placeholder image through Photon.
+ if ( isset( $placeholder_src ) && self::validate_image_url( $placeholder_src ) ) {
+ $placeholder_src = Image_CDN_Core::cdn_url( $placeholder_src );
- // (?<=\s) - Ensure width or height attribute is preceded by a space
- // (width=["\']?) - Matches, and captures, width=, width=", or width='
- // [\d%]+ - Matches 1 or more digits or percent signs
- // (["\']?) - Matches, and captures, ", ', or empty string
- // \s - Ensures there's a space after the attribute
- $new_tag = preg_replace( '#(?<=\s)(width=["\']?)[\d%]+(["\']?)\s?#i', sprintf( '${1}%d${2} ', $resize_args[0] ), $new_tag );
- $new_tag = preg_replace( '#(?<=\s)(height=["\']?)[\d%]+(["\']?)\s?#i', sprintf( '${1}%d${2} ', $resize_args[1] ), $new_tag );
+ if ( $placeholder_src !== $placeholder_src_orig ) {
+ $processor->set_attribute( $source_type, $placeholder_src );
}
- // Tag an image for dimension checking.
- if ( ! self::is_amp_endpoint() ) {
- $new_tag = preg_replace( '#(\s?/)?>(\s*)?$#i', ' data-recalc-dims="1"\1>\2', $new_tag );
+ unset( $placeholder_src );
+ }
+
+ // If we are not transforming the image with resize, fit, or letterbox (lb), then we should remove
+ // the width and height arguments (including HTML4 percentages) from the image to prevent distortion.
+ // Even if $args['w'] and $args['h'] are present, Photon does not crop to those dimensions. Instead,
+ // it appears to favor height.
+ //
+ // If we are transforming the image via one of those methods, let's update the width and height attributes.
+ if ( empty( $args['resize'] ) && empty( $args['fit'] ) && empty( $args['lb'] ) ) {
+ $processor->remove_attribute( 'width' );
+ $processor->remove_attribute( 'height' );
+ } else {
+ $resize_args = isset( $args['resize'] ) ? $args['resize'] : false;
+ if ( false === $resize_args ) {
+ $resize_args = ( ! $resize_args && isset( $args['fit'] ) )
+ ? $args['fit']
+ : false;
+ }
+ if ( false === $resize_args ) {
+ $resize_args = ( ! $resize_args && isset( $args['lb'] ) )
+ ? $args['lb']
+ : false;
}
- // Replace original tag with modified version.
- $content = str_replace( $tag, $new_tag, $content );
+ list( $resize_width, $resize_height ) = explode( ',', $resize_args );
+ $processor->set_attribute( 'width', trim( $resize_width ) );
+ $processor->set_attribute( 'height', trim( $resize_height ) );
}
- } elseif ( preg_match( '#^http(s)?://i[\d]{1}.wp.com#', $src ) && ! empty( $images['link_url'][ $index ] ) && self::validate_image_url( $images['link_url'][ $index ] ) ) {
- $new_tag = preg_replace( '#(href=["\'])' . preg_quote( $images['link_url'][ $index ], '#' ) . '(["\'])#i', '\1' . Image_CDN_Core::cdn_url( $images['link_url'][ $index ] ) . '\2', $tag, 1 );
- $content = str_replace( $tag, $new_tag, $content );
+ // Tag an image for dimension checking.
+ if ( ! self::is_amp_endpoint() ) {
+ $processor->set_attribute( 'data-recalc-dims', '1' );
+ }
}
+ } elseif ( preg_match( '#^http(s)?://i[\d]{1}.wp.com#', $src ) && is_string( $nearest_preceding_href ) && self::validate_image_url( $nearest_preceding_href ) ) {
+ $processor->seek( 'link' );
+ $processor->set_attribute( 'href', Image_CDN_Core::cdn_url( $nearest_preceding_href ) );
+ $processor->seek( 'image' );
}
}
- return $content;
+ return $processor->get_updated_html();
}
/**
diff --git a/projects/packages/image-cdn/tests/php/sample-content/a-tags-with-hash-href.html b/projects/packages/image-cdn/tests/php/sample-content/a-tags-with-hash-href.html
index 4b2c58ea0ce9e..266fdcebd587a 100644
--- a/projects/packages/image-cdn/tests/php/sample-content/a-tags-with-hash-href.html
+++ b/projects/packages/image-cdn/tests/php/sample-content/a-tags-with-hash-href.html
@@ -1,5 +1,5 @@
--RESULTS--
-
+
diff --git a/projects/plugins/boost/changelog/renovate-wordpress-monorepo b/projects/packages/jetpack-mu-wpcom/changelog/renovate-npm-webpack-vulnerability
similarity index 100%
rename from projects/plugins/boost/changelog/renovate-wordpress-monorepo
rename to projects/packages/jetpack-mu-wpcom/changelog/renovate-npm-webpack-vulnerability
diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json
index 4c572f2a9a109..48fb888c0042b 100644
--- a/projects/packages/jetpack-mu-wpcom/package.json
+++ b/projects/packages/jetpack-mu-wpcom/package.json
@@ -43,7 +43,7 @@
"sass": "1.64.1",
"sass-loader": "12.4.0",
"typescript": "^5.0.4",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
},
"dependencies": {
diff --git a/projects/packages/jitm/CHANGELOG.md b/projects/packages/jitm/CHANGELOG.md
index d6fbb0ef3d10d..13dcd5be77c4f 100644
--- a/projects/packages/jitm/CHANGELOG.md
+++ b/projects/packages/jitm/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).
+## [3.1.19] - 2024-08-29
+### Changed
+- Updated package dependencies. [#39111]
+
## [3.1.18] - 2024-08-23
### Changed
- Updated package dependencies. [#39004]
@@ -751,6 +755,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Update Jetpack to use new JITM package
+[3.1.19]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.18...v3.1.19
[3.1.18]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.17...v3.1.18
[3.1.17]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.16...v3.1.17
[3.1.16]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.15...v3.1.16
diff --git a/projects/packages/jitm/package.json b/projects/packages/jitm/package.json
index 34d050daac44b..9ce31fd30b742 100644
--- a/projects/packages/jitm/package.json
+++ b/projects/packages/jitm/package.json
@@ -27,7 +27,7 @@
"@wordpress/browserslist-config": "6.5.0",
"sass": "1.64.1",
"sass-loader": "12.4.0",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
}
}
diff --git a/projects/packages/jitm/src/class-jitm.php b/projects/packages/jitm/src/class-jitm.php
index c8da570a56f58..1e79af826c202 100644
--- a/projects/packages/jitm/src/class-jitm.php
+++ b/projects/packages/jitm/src/class-jitm.php
@@ -20,7 +20,7 @@
*/
class JITM {
- const PACKAGE_VERSION = '3.1.18';
+ const PACKAGE_VERSION = '3.1.19';
/**
* The configuration method that is called from the jetpack-config package.
diff --git a/projects/plugins/boost/changelog/renovate-yoast-phpunit-polyfills-1.x b/projects/packages/masterbar/changelog/renovate-npm-webpack-vulnerability
similarity index 100%
rename from projects/plugins/boost/changelog/renovate-yoast-phpunit-polyfills-1.x
rename to projects/packages/masterbar/changelog/renovate-npm-webpack-vulnerability
diff --git a/projects/packages/masterbar/package.json b/projects/packages/masterbar/package.json
index c239558812d16..542fc9fd1ab3a 100644
--- a/projects/packages/masterbar/package.json
+++ b/projects/packages/masterbar/package.json
@@ -42,7 +42,7 @@
"postcss-loader": "6.2.0",
"sass": "1.64.1",
"sass-loader": "12.4.0",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
}
}
diff --git a/projects/packages/my-jetpack/CHANGELOG.md b/projects/packages/my-jetpack/CHANGELOG.md
index bdc0bb51e90b7..c26f3b6f70b69 100644
--- a/projects/packages/my-jetpack/CHANGELOG.md
+++ b/projects/packages/my-jetpack/CHANGELOG.md
@@ -5,6 +5,16 @@ 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.33.1] - 2024-08-29
+### Changed
+- Admin menu: change order of Jetpack sub-menu items [#39095]
+- My Jetpack: reflect tier filters properly on product class and UI. Fix little nuances with date constructor [#39074]
+- Updated package dependencies. [#39111]
+
+### Fixed
+- Don't consider user lifecycle status when repeating evaluation [#39069]
+- My Jetpack: Fix the popover and active button of the Bboost card are overlapping [#39067]
+
## [4.33.0] - 2024-08-26
### Added
- Add context switching to videopress card from yearly views to monthly views [#38979]
@@ -1669,6 +1679,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Created package
+[4.33.1]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.33.0...4.33.1
[4.33.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.32.4...4.33.0
[4.32.4]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.32.3...4.32.4
[4.32.3]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.32.2...4.32.3
diff --git a/projects/packages/my-jetpack/_inc/components/welcome-flow/index.tsx b/projects/packages/my-jetpack/_inc/components/welcome-flow/index.tsx
index 94719828bcb2e..deb312653e88f 100644
--- a/projects/packages/my-jetpack/_inc/components/welcome-flow/index.tsx
+++ b/projects/packages/my-jetpack/_inc/components/welcome-flow/index.tsx
@@ -23,7 +23,8 @@ export type WelcomeFlowExperiment = {
const WelcomeFlow: FC< PropsWithChildren > = ( { children } ) => {
const { recordEvent } = useAnalytics();
const { dismissWelcomeBanner } = useWelcomeBanner();
- const { submitEvaluation, saveEvaluationResult } = useEvaluationRecommendations();
+ const { recommendedModules, submitEvaluation, saveEvaluationResult } =
+ useEvaluationRecommendations();
const {
siteIsRegistered,
siteIsRegistering,
@@ -44,15 +45,27 @@ const WelcomeFlow: FC< PropsWithChildren > = ( { children } ) => {
if ( ! siteIsRegistered || welcomeFlowExperiment.isLoading ) {
return 'connection';
} else if ( ! isProcessingEvaluation ) {
- if ( ! isJetpackUserNew() || welcomeFlowExperiment.variation !== 'treatment' ) {
- // If the user is not new, we don't show the evaluation step
+ if (
+ ! recommendedModules &&
+ ( welcomeFlowExperiment.variation === 'control' || ! isJetpackUserNew() )
+ ) {
+ // If user is not new but doesn't have recommendations, we skip evaluation
+ // If user has recommendations, it means they were already in treatment group and they redo the evaluation
return null;
}
+
+ // Otherwise, it means user is either new or just repeats the recommendation
return 'evaluation';
}
return 'evaluation-processing';
- }, [ isProcessingEvaluation, siteIsRegistered, welcomeFlowExperiment ] );
+ }, [
+ isProcessingEvaluation,
+ recommendedModules,
+ siteIsRegistered,
+ welcomeFlowExperiment.isLoading,
+ welcomeFlowExperiment.variation,
+ ] );
useEffect( () => {
if ( prevStep !== currentStep ) {
diff --git a/projects/packages/my-jetpack/changelog/add-more-eslint-rules b/projects/packages/my-jetpack/changelog/add-more-eslint-rules
deleted file mode 100644
index 2b32cb03e644c..0000000000000
--- a/projects/packages/my-jetpack/changelog/add-more-eslint-rules
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Fix new eslint sniffs. Should be no change in functionality.
-
-
diff --git a/projects/packages/my-jetpack/changelog/change-my-jetpack-disabled-tiers-handle b/projects/packages/my-jetpack/changelog/change-my-jetpack-disabled-tiers-handle
deleted file mode 100644
index 49cd68c2f1c58..0000000000000
--- a/projects/packages/my-jetpack/changelog/change-my-jetpack-disabled-tiers-handle
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-My Jetpack: reflect tier filters properly on product class and UI. Fix little nuances with date constructor
diff --git a/projects/packages/my-jetpack/changelog/fix-boost-score-popover b/projects/packages/my-jetpack/changelog/fix-boost-score-popover
deleted file mode 100644
index 8aaff1a860047..0000000000000
--- a/projects/packages/my-jetpack/changelog/fix-boost-score-popover
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-My Jetpack: Fix the popover and active button of the Bboost card are overlapping
diff --git a/projects/packages/my-jetpack/changelog/try-no-version-bumps-in-trunk b/projects/packages/my-jetpack/changelog/try-no-version-bumps-in-trunk
deleted file mode 100644
index 91efe85c55e06..0000000000000
--- a/projects/packages/my-jetpack/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/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json
index 3735b0ac72a5d..76706c2a685b9 100644
--- a/projects/packages/my-jetpack/package.json
+++ b/projects/packages/my-jetpack/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-my-jetpack",
- "version": "4.33.0",
+ "version": "4.33.1",
"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": {
@@ -75,7 +75,7 @@
"sass-loader": "12.4.0",
"storybook": "8.2.9",
"typescript": "5.0.4",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
}
}
diff --git a/projects/packages/my-jetpack/src/class-activitylog.php b/projects/packages/my-jetpack/src/class-activitylog.php
index 0e59226dbd508..4de90c075ded5 100644
--- a/projects/packages/my-jetpack/src/class-activitylog.php
+++ b/projects/packages/my-jetpack/src/class-activitylog.php
@@ -51,7 +51,7 @@ public static function add_submenu_jetpack() {
'manage_options',
esc_url( Redirect::get_url( 'cloud-activity-log-wp-menu', $args ) ),
null,
- 1
+ 8
);
}
}
diff --git a/projects/packages/my-jetpack/src/class-initializer.php b/projects/packages/my-jetpack/src/class-initializer.php
index b0be741ad3c7b..3e164192b9764 100644
--- a/projects/packages/my-jetpack/src/class-initializer.php
+++ b/projects/packages/my-jetpack/src/class-initializer.php
@@ -42,7 +42,7 @@ class Initializer {
*
* @var string
*/
- const PACKAGE_VERSION = '4.33.0';
+ const PACKAGE_VERSION = '4.33.1';
/**
* HTML container ID for the IDC screen on My Jetpack page.
diff --git a/projects/packages/my-jetpack/src/class-jetpack-manage.php b/projects/packages/my-jetpack/src/class-jetpack-manage.php
index be32839498d54..3a732192c90a9 100644
--- a/projects/packages/my-jetpack/src/class-jetpack-manage.php
+++ b/projects/packages/my-jetpack/src/class-jetpack-manage.php
@@ -49,7 +49,7 @@ public static function add_submenu_jetpack() {
'manage_options',
esc_url( Redirect::get_url( 'cloud-manage-dashboard-wp-menu', $args ) ),
null,
- 100
+ 15
);
}
diff --git a/projects/packages/plugin-deactivation/CHANGELOG.md b/projects/packages/plugin-deactivation/CHANGELOG.md
index b8c1a3a540873..59c5b3ee10414 100644
--- a/projects/packages/plugin-deactivation/CHANGELOG.md
+++ b/projects/packages/plugin-deactivation/CHANGELOG.md
@@ -5,6 +5,11 @@ 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.2.2] - 2024-08-29
+### Changed
+- Updated package dependencies. [#39004]
+- Updated package dependencies. [#39111]
+
## [0.2.1] - 2024-03-15
### Changed
- Internal updates.
@@ -47,6 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Added package to intercept plugin deactivation [#27081]
+[0.2.2]: https://github.com/Automattic/jetpack-plugin-deactivation/compare/v0.2.1...v0.2.2
[0.2.1]: https://github.com/Automattic/jetpack-plugin-deactivation/compare/v0.2.0...v0.2.1
[0.2.0]: https://github.com/Automattic/jetpack-plugin-deactivation/compare/v0.1.6...v0.2.0
[0.1.6]: https://github.com/Automattic/jetpack-plugin-deactivation/compare/v0.1.5...v0.1.6
diff --git a/projects/packages/plugin-deactivation/changelog/try-no-version-bumps-in-trunk b/projects/packages/plugin-deactivation/changelog/try-no-version-bumps-in-trunk
deleted file mode 100644
index 91efe85c55e06..0000000000000
--- a/projects/packages/plugin-deactivation/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/packages/plugin-deactivation/package.json b/projects/packages/plugin-deactivation/package.json
index 7a21c67011c2c..9becad3698ca9 100644
--- a/projects/packages/plugin-deactivation/package.json
+++ b/projects/packages/plugin-deactivation/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-plugin-deactivation",
- "version": "0.2.1",
+ "version": "0.2.2",
"description": "Intercept plugin deactivation with a dialog",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/plugin-deactivation/#readme",
"bugs": {
@@ -27,7 +27,7 @@
"sass-loader": "12.4.0",
"tslib": "2.5.0",
"typescript": "5.0.4",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
}
}
diff --git a/projects/packages/plugin-deactivation/src/class-deactivation-handler.php b/projects/packages/plugin-deactivation/src/class-deactivation-handler.php
index dd0ce7517c1be..30eb420e8e29f 100644
--- a/projects/packages/plugin-deactivation/src/class-deactivation-handler.php
+++ b/projects/packages/plugin-deactivation/src/class-deactivation-handler.php
@@ -21,7 +21,7 @@ class Deactivation_Handler {
*
* @var string
*/
- const PACKAGE_VERSION = '0.2.1';
+ const PACKAGE_VERSION = '0.2.2';
/**
* Slug of the plugin to intercept deactivation for.
diff --git a/projects/packages/publicize/CHANGELOG.md b/projects/packages/publicize/CHANGELOG.md
index 3932e2d010018..7a33c43a78778 100644
--- a/projects/packages/publicize/CHANGELOG.md
+++ b/projects/packages/publicize/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).
+## [0.50.1] - 2024-08-29
+### Added
+- Added share status info to Jetpack sidebar [#39073]
+
+### Changed
+- Updated package dependencies. [#39111]
+
## [0.50.0] - 2024-08-26
### Added
- Added the new feature flag for the social share status [#39015]
@@ -666,6 +673,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated package dependencies.
- Update package.json metadata.
+[0.50.1]: https://github.com/Automattic/jetpack-publicize/compare/v0.50.0...v0.50.1
[0.50.0]: https://github.com/Automattic/jetpack-publicize/compare/v0.49.2...v0.50.0
[0.49.2]: https://github.com/Automattic/jetpack-publicize/compare/v0.49.1...v0.49.2
[0.49.1]: https://github.com/Automattic/jetpack-publicize/compare/v0.49.0...v0.49.1
diff --git a/projects/packages/publicize/changelog/add-social-share-status-info b/projects/packages/publicize/changelog/add-social-share-status-info
deleted file mode 100644
index 0d38a15639ec3..0000000000000
--- a/projects/packages/publicize/changelog/add-social-share-status-info
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Added share status info to Jetpack sidebar
diff --git a/projects/packages/publicize/changelog/add-social-share-status-shares-modal b/projects/packages/publicize/changelog/add-social-share-status-shares-modal
new file mode 100644
index 0000000000000..bf7d182e6814d
--- /dev/null
+++ b/projects/packages/publicize/changelog/add-social-share-status-shares-modal
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add share status log modal to published posts
diff --git a/projects/packages/publicize/changelog/try-no-version-bumps-in-trunk b/projects/packages/publicize/changelog/try-no-version-bumps-in-trunk
deleted file mode 100644
index 91efe85c55e06..0000000000000
--- a/projects/packages/publicize/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/packages/publicize/package.json b/projects/packages/publicize/package.json
index b417481070cd8..1b8f123ea551a 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.50.0",
+ "version": "0.50.1",
"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": {
@@ -30,7 +30,7 @@
"@automattic/jetpack-webpack-config": "workspace:*",
"@wordpress/browserslist-config": "6.5.0",
"concurrently": "7.6.0",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
},
"dependencies": {
diff --git a/projects/packages/schema/CHANGELOG.md b/projects/packages/schema/CHANGELOG.md
index 411eeac18f4d6..4f89809afb93f 100644
--- a/projects/packages/schema/CHANGELOG.md
+++ b/projects/packages/schema/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] - 2024-08-29
+### Changed
+- Cleanup utils [#39025]
+
## 0.1.0 - 2024-08-22
### Added
- Initial version. [#38563]
### Changed
- Updated package dependencies. [#39004]
+
+[0.1.1]: https://github.com/Automattic/jetpack-schema/compare/v0.1.0...v0.1.1
diff --git a/projects/packages/schema/changelog/try-no-version-bumps-in-trunk b/projects/packages/schema/changelog/try-no-version-bumps-in-trunk
deleted file mode 100644
index 91efe85c55e06..0000000000000
--- a/projects/packages/schema/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/packages/schema/src/class-schema.php b/projects/packages/schema/src/class-schema.php
index a5bb133d15fa5..fe3b30f6e0be1 100644
--- a/projects/packages/schema/src/class-schema.php
+++ b/projects/packages/schema/src/class-schema.php
@@ -65,7 +65,7 @@
* $parsed_data = $my_schema->parse($input_data);
*/
class Schema {
- const PACKAGE_VERSION = '0.1.0';
+ const PACKAGE_VERSION = '0.1.1';
public static function as_string() {
return new Schema_Parser( new Type_String() );
diff --git a/projects/packages/search/changelog/add-allow-customizing-highlighted-fields b/projects/packages/search/changelog/add-allow-customizing-highlighted-fields
new file mode 100644
index 0000000000000..bc31a86a45be0
--- /dev/null
+++ b/projects/packages/search/changelog/add-allow-customizing-highlighted-fields
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Search: allow customizing highlighted fields
diff --git a/projects/plugins/social/changelog/renovate-definitelytyped b/projects/packages/search/changelog/renovate-npm-webpack-vulnerability
similarity index 100%
rename from projects/plugins/social/changelog/renovate-definitelytyped
rename to projects/packages/search/changelog/renovate-npm-webpack-vulnerability
diff --git a/projects/packages/search/changelog/update-jetpack-menu-item-order b/projects/packages/search/changelog/update-jetpack-menu-item-order
new file mode 100644
index 0000000000000..4bfbd859ba2bf
--- /dev/null
+++ b/projects/packages/search/changelog/update-jetpack-menu-item-order
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Admin menu: change order of Jetpack sub-menu items
diff --git a/projects/packages/search/package.json b/projects/packages/search/package.json
index aeca4c9411f08..c370738adde1b 100644
--- a/projects/packages/search/package.json
+++ b/projects/packages/search/package.json
@@ -91,7 +91,7 @@
"sass": "1.64.1",
"sass-loader": "12.4.0",
"size-limit": "11.1.4",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
},
"browserslist": [
diff --git a/projects/packages/search/src/dashboard/class-dashboard.php b/projects/packages/search/src/dashboard/class-dashboard.php
index 8da1e6ea86254..ac6494edc6f23 100644
--- a/projects/packages/search/src/dashboard/class-dashboard.php
+++ b/projects/packages/search/src/dashboard/class-dashboard.php
@@ -102,7 +102,8 @@ public function add_wp_admin_submenu() {
_x( 'Search', 'product name shown in menu', 'jetpack-search-pkg' ),
'manage_options',
'jetpack-search',
- array( $this, 'render' )
+ array( $this, 'render' ),
+ 10
);
} else {
// always add the page, but hide it from the menu.
diff --git a/projects/packages/search/src/instant-search/components/search-app.jsx b/projects/packages/search/src/instant-search/components/search-app.jsx
index e00e8bfc89054..58423aaa4fae4 100644
--- a/projects/packages/search/src/instant-search/components/search-app.jsx
+++ b/projects/packages/search/src/instant-search/components/search-app.jsx
@@ -229,6 +229,7 @@ class SearchApp extends Component {
sort: this.props.sort,
postsPerPage: this.props.options.postsPerPage,
adminQueryFilter: this.props.options.adminQueryFilter,
+ highlightFields: this.props.options.highlightFields,
isInCustomizer: this.props.isInCustomizer,
} );
};
diff --git a/projects/packages/search/src/instant-search/components/search-result-expanded.jsx b/projects/packages/search/src/instant-search/components/search-result-expanded.jsx
index 7bb2af8a23cb7..c712740a56c40 100644
--- a/projects/packages/search/src/instant-search/components/search-result-expanded.jsx
+++ b/projects/packages/search/src/instant-search/components/search-result-expanded.jsx
@@ -89,7 +89,16 @@ export default function SearchResultExpanded( props ) {
className="jetpack-instant-search__search-result-expanded__content"
//eslint-disable-next-line react/no-danger
dangerouslySetInnerHTML={ {
- __html: highlight.content.join( ' ... ' ),
+ __html:
+ highlight && typeof highlight === 'object'
+ ? Object.entries( highlight )
+ .filter(
+ ( [ key, value ] ) =>
+ key !== 'comments' && key !== 'title' && Array.isArray( value )
+ )
+ .map( ( [ , array ] ) => array.join( ' ... ' ) )
+ .join( ' ... ' )
+ : '',
} }
/>
diff --git a/projects/packages/search/src/instant-search/components/search-result-minimal.jsx b/projects/packages/search/src/instant-search/components/search-result-minimal.jsx
index 7e0adff204a37..46739b9af523b 100644
--- a/projects/packages/search/src/instant-search/components/search-result-minimal.jsx
+++ b/projects/packages/search/src/instant-search/components/search-result-minimal.jsx
@@ -87,7 +87,16 @@ class SearchResultMinimal extends Component {
className="jetpack-instant-search__search-result-minimal-content"
//eslint-disable-next-line react/no-danger
dangerouslySetInnerHTML={ {
- __html: this.props.result.highlight.content.join( ' ... ' ),
+ __html:
+ this.props.result.highlight && typeof this.props.result.highlight === 'object'
+ ? Object.entries( this.props.result.highlight )
+ .filter(
+ ( [ key, value ] ) =>
+ key !== 'comments' && key !== 'title' && Array.isArray( value )
+ )
+ .map( ( [ , array ] ) => array.join( ' ... ' ) )
+ .join( ' ... ' )
+ : '',
} }
/>
);
@@ -98,7 +107,13 @@ class SearchResultMinimal extends Component {
if ( result_type !== 'post' ) {
return null;
}
- const noMatchingContent = ! highlight.content || highlight.content[ 0 ] === '';
+ const noMatchingContent =
+ ! highlight ||
+ typeof highlight !== 'object' ||
+ Object.entries( highlight ).every(
+ ( [ key, value ] ) =>
+ key === 'comments' || key === 'title' || ! Array.isArray( value ) || value[ 0 ] === ''
+ );
return (
0;
+ typeof highlight === 'object' &&
+ Object.entries( highlight ).some(
+ ( [ key, value ] ) =>
+ key !== 'title' && key !== 'comments' && Array.isArray( value ) && value[ 0 ]?.length > 0
+ );
return (
{
+ let foundIndex = -1;
+ subMenuItems.forEach( ( item, index ) => {
+ const href = item.href;
+ if (
+ ( matchType === 'end' && href.endsWith( urlPattern ) ) ||
+ ( matchType === 'start' && href.startsWith( urlPattern ) )
+ ) {
+ foundIndex = index + 1;
+ }
+ } );
+ return foundIndex;
+ };
+
+ urlPatterns.forEach( ( { key, pattern, matchType } ) => {
+ const index = findIndex( pattern, matchType );
+ pageOrder[ key ] = index;
+ } );
+ return pageOrder;
+ }
+ }
+}
+
/**
* Manages changing the visuals of the sub-nav items on the left sidebar when the React app changes routes
*
- * @param pageOrder
*/
-window.wpNavMenuClassChange = function (
- pageOrder = { myJetpack: 1, activityLog: 2, dashboard: 3, settings: 4 }
-) {
+window.wpNavMenuClassChange = function () {
+ const pageOrder = jetpackPageOrder();
+
let hash = window.location.hash;
let page = new URLSearchParams( window.location.search );
diff --git a/projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-react-page.php b/projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-react-page.php
index 56b96499d14a4..428108f4dcf3d 100644
--- a/projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-react-page.php
+++ b/projects/plugins/jetpack/_inc/lib/admin-pages/class.jetpack-react-page.php
@@ -1,5 +1,6 @@
is_offline_mode()
+ || Jetpack::is_connection_ready()
+ ) {
+ remove_submenu_page( 'jetpack', 'jetpack' );
+ }
+ }
+
/**
* Add Jetpack Dashboard sub-link and point it to AAG if the user can view stats, manage modules or if Protect is active.
*
@@ -86,8 +102,14 @@ public function add_page_actions( $hook ) {
*/
public function jetpack_add_dashboard_sub_nav_item() {
if ( ( new Status() )->is_offline_mode() || Jetpack::is_connection_ready() ) {
- add_submenu_page( 'jetpack', __( 'Dashboard', 'jetpack' ), __( 'Dashboard', 'jetpack' ), 'jetpack_admin_page', 'jetpack#/dashboard', '__return_null', 1 );
- remove_submenu_page( 'jetpack', 'jetpack' );
+ Admin_Menu::add_menu(
+ __( 'Dashboard', 'jetpack' ),
+ __( 'Dashboard', 'jetpack' ),
+ 'jetpack_admin_page',
+ Jetpack::admin_url( array( 'page' => 'jetpack#/dashboard' ) ),
+ null, // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- See https://core.trac.wordpress.org/ticket/52539.
+ 14
+ );
}
}
@@ -165,7 +187,14 @@ private function can_access_settings() {
*/
public function jetpack_add_settings_sub_nav_item() {
if ( $this->can_access_settings() ) {
- add_submenu_page( 'jetpack', __( 'Settings', 'jetpack' ), __( 'Settings', 'jetpack' ), 'jetpack_admin_page', 'jetpack#/settings', '__return_null' );
+ Admin_Menu::add_menu(
+ __( 'Settings', 'jetpack' ),
+ __( 'Settings', 'jetpack' ),
+ 'jetpack_admin_page',
+ Jetpack::admin_url( array( 'page' => 'jetpack#/settings' ) ),
+ null, // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- See https://core.trac.wordpress.org/ticket/52539.
+ 13
+ );
}
}
diff --git a/projects/plugins/jetpack/changelog/add-monetize-add-wpcom-currencies b/projects/plugins/jetpack/changelog/add-monetize-add-wpcom-currencies
new file mode 100644
index 0000000000000..7d1631b31d4b2
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/add-monetize-add-wpcom-currencies
@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+Monetize: support more currencies
diff --git a/projects/plugins/jetpack/changelog/change-ai-image-generation-unlimited-plan-hard-limit b/projects/plugins/jetpack/changelog/change-ai-image-generation-unlimited-plan-hard-limit
new file mode 100644
index 0000000000000..28255fb70ecb6
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/change-ai-image-generation-unlimited-plan-hard-limit
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+Jetpack AI: remove hardcoded limit on image generation, it's handled by backend
diff --git a/projects/plugins/jetpack/changelog/change-jetpack-ai-sidebar-hide-usage-panel-on-plans b/projects/plugins/jetpack/changelog/change-jetpack-ai-sidebar-hide-usage-panel-on-plans
new file mode 100644
index 0000000000000..10a3084411675
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/change-jetpack-ai-sidebar-hide-usage-panel-on-plans
@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+Jetpack AI: hide usagepanel when tier plans are disabled. Show QuotaExceededMessage instead of nudges
diff --git a/projects/plugins/jetpack/changelog/fix-map-block-selection b/projects/plugins/jetpack/changelog/fix-map-block-selection
new file mode 100644
index 0000000000000..989aae81cfcda
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/fix-map-block-selection
@@ -0,0 +1,4 @@
+Significance: patch
+Type: enhancement
+
+Map block: Allow maps on WordPress.com to be selectable.
diff --git a/projects/plugins/boost/changelog/prerelease b/projects/plugins/jetpack/changelog/renovate-npm-webpack-vulnerability
similarity index 80%
rename from projects/plugins/boost/changelog/prerelease
rename to projects/plugins/jetpack/changelog/renovate-npm-webpack-vulnerability
index 7d3f9cba4bc0e..1eaea6a769e84 100644
--- a/projects/plugins/boost/changelog/prerelease
+++ b/projects/plugins/jetpack/changelog/renovate-npm-webpack-vulnerability
@@ -1,4 +1,4 @@
Significance: patch
-Type: fixed
+Type: other
Updated package dependencies.
diff --git a/projects/plugins/jetpack/changelog/update-audit-usage-of-extensions-when-blocks-disabled b/projects/plugins/jetpack/changelog/update-audit-usage-of-extensions-when-blocks-disabled
new file mode 100644
index 0000000000000..5d17a625c878e
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-audit-usage-of-extensions-when-blocks-disabled
@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+Blocks: Ensure function is loaded even if blocks aren't enabled
diff --git a/projects/plugins/jetpack/changelog/update-jetpack-ai-breve-anchorless-popover b/projects/plugins/jetpack/changelog/update-jetpack-ai-breve-anchorless-popover
new file mode 100644
index 0000000000000..b04e8b78a7564
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-jetpack-ai-breve-anchorless-popover
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+AI Assistant: Limit popover height and fix anchorless popover
diff --git a/projects/plugins/jetpack/changelog/update-jetpack-ai-breve-clean b/projects/plugins/jetpack/changelog/update-jetpack-ai-breve-clean
new file mode 100644
index 0000000000000..a0a449db0a03f
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-jetpack-ai-breve-clean
@@ -0,0 +1,4 @@
+Significance: patch
+Type: other
+
+AI Assistant: Remove dead Breve code
diff --git a/projects/plugins/jetpack/changelog/update-jetpack-ai-update-sidebar-fair-usage-messaging b/projects/plugins/jetpack/changelog/update-jetpack-ai-update-sidebar-fair-usage-messaging
new file mode 100644
index 0000000000000..68a0489bb624c
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-jetpack-ai-update-sidebar-fair-usage-messaging
@@ -0,0 +1,4 @@
+Significance: minor
+Type: other
+
+Jetpack AI: update fair usage messaging on the sidebar.
diff --git a/projects/plugins/jetpack/changelog/update-jetpack-menu-item-order b/projects/plugins/jetpack/changelog/update-jetpack-menu-item-order
new file mode 100644
index 0000000000000..c96aa7333e16a
--- /dev/null
+++ b/projects/plugins/jetpack/changelog/update-jetpack-menu-item-order
@@ -0,0 +1,4 @@
+Significance: patch
+Type: enhancement
+
+Admin menu: Change order of Jetpack sub-menu items
diff --git a/projects/plugins/jetpack/class.jetpack-admin.php b/projects/plugins/jetpack/class.jetpack-admin.php
index 73e437c1d83f3..60e1af1fd3747 100644
--- a/projects/plugins/jetpack/class.jetpack-admin.php
+++ b/projects/plugins/jetpack/class.jetpack-admin.php
@@ -64,6 +64,7 @@ private function __construct() {
add_action( 'admin_init', array( $jetpack_react, 'react_redirects' ), 0 );
add_action( 'admin_menu', array( $jetpack_react, 'add_actions' ), 998 );
+ add_action( 'admin_menu', array( $jetpack_react, 'remove_jetpack_menu' ), 2000 );
add_action( 'jetpack_admin_menu', array( $jetpack_react, 'jetpack_add_dashboard_sub_nav_item' ) );
add_action( 'jetpack_admin_menu', array( $jetpack_react, 'jetpack_add_settings_sub_nav_item' ) );
add_action( 'jetpack_admin_menu', array( $this, 'admin_menu_debugger' ) );
diff --git a/projects/plugins/jetpack/extensions/blocks/ai-assistant/components/quota-exceeded-message/index.tsx b/projects/plugins/jetpack/extensions/blocks/ai-assistant/components/quota-exceeded-message/index.tsx
index a7a8f17ce8e96..8163e41c2d46e 100644
--- a/projects/plugins/jetpack/extensions/blocks/ai-assistant/components/quota-exceeded-message/index.tsx
+++ b/projects/plugins/jetpack/extensions/blocks/ai-assistant/components/quota-exceeded-message/index.tsx
@@ -266,17 +266,36 @@ const VIPUpgradePrompt = ( {
);
};
+type FairUsageNoticeProps = {
+ variant?: 'error' | 'muted';
+};
+
/**
* The fair usage notice component.
+ * @param {FairUsageNoticeProps} props - Fair usage notice component props.
+ * @param {FairUsageNoticeProps.variant} props.variant - The variant of the notice to render.
* @return {ReactElement} the Notice component with the fair usage message.
*/
-const FairUsageNotice = () => {
+export const FairUsageNotice = ( { variant = 'error' }: FairUsageNoticeProps ) => {
const useFairUsageNoticeMessageElement = useFairUsageNoticeMessage();
- return (
-
- { useFairUsageNoticeMessageElement }
-
- );
+
+ if ( variant === 'muted' ) {
+ return (
+
+ { useFairUsageNoticeMessageElement }
+
+ );
+ }
+
+ if ( variant === 'error' ) {
+ return (
+
+ { useFairUsageNoticeMessageElement }
+
+ );
+ }
+
+ return null;
};
const QuotaExceededMessage = props => {
diff --git a/projects/plugins/jetpack/extensions/blocks/ai-assistant/components/quota-exceeded-message/style.scss b/projects/plugins/jetpack/extensions/blocks/ai-assistant/components/quota-exceeded-message/style.scss
index 5e04a8e519ec1..35b21b5ec6713 100644
--- a/projects/plugins/jetpack/extensions/blocks/ai-assistant/components/quota-exceeded-message/style.scss
+++ b/projects/plugins/jetpack/extensions/blocks/ai-assistant/components/quota-exceeded-message/style.scss
@@ -12,3 +12,24 @@
}
}
}
+
+.jetpack-ai-fair-usage-notice-muted-variant {
+ line-height: 1.4;
+ margin: 0px;
+ text-wrap: pretty;
+ font-size: calc(13px);
+ font-weight: normal;
+ color: #757575;
+
+ a {
+ color: #757575;
+ }
+}
+
+.jetpack-ai-fair-usage-notice {
+ color: #1E1E1E;
+
+ a {
+ color: #1E1E1E;
+ }
+}
diff --git a/projects/plugins/jetpack/extensions/blocks/ai-assistant/edit.js b/projects/plugins/jetpack/extensions/blocks/ai-assistant/edit.js
index b8e65c0df2338..f2bed94f0106d 100644
--- a/projects/plugins/jetpack/extensions/blocks/ai-assistant/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/ai-assistant/edit.js
@@ -26,10 +26,10 @@ import clsx from 'clsx';
*/
import UsagePanel from '../../plugins/ai-assistant-plugin/components/usage-panel';
import { USAGE_PANEL_PLACEMENT_BLOCK_SETTINGS_SIDEBAR } from '../../plugins/ai-assistant-plugin/components/usage-panel/types';
-import { PLAN_TYPE_FREE, usePlanType } from '../../shared/use-plan-type';
+import { PLAN_TYPE_FREE, PLAN_TYPE_UNLIMITED, usePlanType } from '../../shared/use-plan-type';
import ConnectPrompt from './components/connect-prompt';
import FeedbackControl from './components/feedback-control';
-import QuotaExceededMessage from './components/quota-exceeded-message';
+import QuotaExceededMessage, { FairUsageNotice } from './components/quota-exceeded-message';
import ToolbarControls from './components/toolbar-controls';
import { getStoreBlockId } from './extensions/ai-assistant/with-ai-assistant';
import useAIAssistant from './hooks/use-ai-assistant';
@@ -61,6 +61,7 @@ export default function AIAssistantEdit( { attributes, setAttributes, clientId,
requestsLimit,
currentTier,
loading: loadingAiFeature,
+ tierPlansEnabled,
} = useAiFeature();
const requestsRemaining = Math.max( requestsLimit - requestsCount, 0 );
@@ -322,6 +323,10 @@ export default function AIAssistantEdit( { attributes, setAttributes, clientId,
);
+ const fairUsageNotice = (
+ <>{ isOverLimit && planType === PLAN_TYPE_UNLIMITED &&
) }
--RESULTS--
-
+
diff --git a/projects/plugins/boost/changelog/renovate-wordpress-monorepo b/projects/packages/jetpack-mu-wpcom/changelog/renovate-npm-webpack-vulnerability
similarity index 100%
rename from projects/plugins/boost/changelog/renovate-wordpress-monorepo
rename to projects/packages/jetpack-mu-wpcom/changelog/renovate-npm-webpack-vulnerability
diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json
index 4c572f2a9a109..48fb888c0042b 100644
--- a/projects/packages/jetpack-mu-wpcom/package.json
+++ b/projects/packages/jetpack-mu-wpcom/package.json
@@ -43,7 +43,7 @@
"sass": "1.64.1",
"sass-loader": "12.4.0",
"typescript": "^5.0.4",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
},
"dependencies": {
diff --git a/projects/packages/jitm/CHANGELOG.md b/projects/packages/jitm/CHANGELOG.md
index d6fbb0ef3d10d..13dcd5be77c4f 100644
--- a/projects/packages/jitm/CHANGELOG.md
+++ b/projects/packages/jitm/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).
+## [3.1.19] - 2024-08-29
+### Changed
+- Updated package dependencies. [#39111]
+
## [3.1.18] - 2024-08-23
### Changed
- Updated package dependencies. [#39004]
@@ -751,6 +755,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Update Jetpack to use new JITM package
+[3.1.19]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.18...v3.1.19
[3.1.18]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.17...v3.1.18
[3.1.17]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.16...v3.1.17
[3.1.16]: https://github.com/Automattic/jetpack-jitm/compare/v3.1.15...v3.1.16
diff --git a/projects/packages/jitm/package.json b/projects/packages/jitm/package.json
index 34d050daac44b..9ce31fd30b742 100644
--- a/projects/packages/jitm/package.json
+++ b/projects/packages/jitm/package.json
@@ -27,7 +27,7 @@
"@wordpress/browserslist-config": "6.5.0",
"sass": "1.64.1",
"sass-loader": "12.4.0",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
}
}
diff --git a/projects/packages/jitm/src/class-jitm.php b/projects/packages/jitm/src/class-jitm.php
index c8da570a56f58..1e79af826c202 100644
--- a/projects/packages/jitm/src/class-jitm.php
+++ b/projects/packages/jitm/src/class-jitm.php
@@ -20,7 +20,7 @@
*/
class JITM {
- const PACKAGE_VERSION = '3.1.18';
+ const PACKAGE_VERSION = '3.1.19';
/**
* The configuration method that is called from the jetpack-config package.
diff --git a/projects/plugins/boost/changelog/renovate-yoast-phpunit-polyfills-1.x b/projects/packages/masterbar/changelog/renovate-npm-webpack-vulnerability
similarity index 100%
rename from projects/plugins/boost/changelog/renovate-yoast-phpunit-polyfills-1.x
rename to projects/packages/masterbar/changelog/renovate-npm-webpack-vulnerability
diff --git a/projects/packages/masterbar/package.json b/projects/packages/masterbar/package.json
index c239558812d16..542fc9fd1ab3a 100644
--- a/projects/packages/masterbar/package.json
+++ b/projects/packages/masterbar/package.json
@@ -42,7 +42,7 @@
"postcss-loader": "6.2.0",
"sass": "1.64.1",
"sass-loader": "12.4.0",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
}
}
diff --git a/projects/packages/my-jetpack/CHANGELOG.md b/projects/packages/my-jetpack/CHANGELOG.md
index bdc0bb51e90b7..c26f3b6f70b69 100644
--- a/projects/packages/my-jetpack/CHANGELOG.md
+++ b/projects/packages/my-jetpack/CHANGELOG.md
@@ -5,6 +5,16 @@ 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.33.1] - 2024-08-29
+### Changed
+- Admin menu: change order of Jetpack sub-menu items [#39095]
+- My Jetpack: reflect tier filters properly on product class and UI. Fix little nuances with date constructor [#39074]
+- Updated package dependencies. [#39111]
+
+### Fixed
+- Don't consider user lifecycle status when repeating evaluation [#39069]
+- My Jetpack: Fix the popover and active button of the Bboost card are overlapping [#39067]
+
## [4.33.0] - 2024-08-26
### Added
- Add context switching to videopress card from yearly views to monthly views [#38979]
@@ -1669,6 +1679,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Created package
+[4.33.1]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.33.0...4.33.1
[4.33.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.32.4...4.33.0
[4.32.4]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.32.3...4.32.4
[4.32.3]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.32.2...4.32.3
diff --git a/projects/packages/my-jetpack/_inc/components/welcome-flow/index.tsx b/projects/packages/my-jetpack/_inc/components/welcome-flow/index.tsx
index 94719828bcb2e..deb312653e88f 100644
--- a/projects/packages/my-jetpack/_inc/components/welcome-flow/index.tsx
+++ b/projects/packages/my-jetpack/_inc/components/welcome-flow/index.tsx
@@ -23,7 +23,8 @@ export type WelcomeFlowExperiment = {
const WelcomeFlow: FC< PropsWithChildren > = ( { children } ) => {
const { recordEvent } = useAnalytics();
const { dismissWelcomeBanner } = useWelcomeBanner();
- const { submitEvaluation, saveEvaluationResult } = useEvaluationRecommendations();
+ const { recommendedModules, submitEvaluation, saveEvaluationResult } =
+ useEvaluationRecommendations();
const {
siteIsRegistered,
siteIsRegistering,
@@ -44,15 +45,27 @@ const WelcomeFlow: FC< PropsWithChildren > = ( { children } ) => {
if ( ! siteIsRegistered || welcomeFlowExperiment.isLoading ) {
return 'connection';
} else if ( ! isProcessingEvaluation ) {
- if ( ! isJetpackUserNew() || welcomeFlowExperiment.variation !== 'treatment' ) {
- // If the user is not new, we don't show the evaluation step
+ if (
+ ! recommendedModules &&
+ ( welcomeFlowExperiment.variation === 'control' || ! isJetpackUserNew() )
+ ) {
+ // If user is not new but doesn't have recommendations, we skip evaluation
+ // If user has recommendations, it means they were already in treatment group and they redo the evaluation
return null;
}
+
+ // Otherwise, it means user is either new or just repeats the recommendation
return 'evaluation';
}
return 'evaluation-processing';
- }, [ isProcessingEvaluation, siteIsRegistered, welcomeFlowExperiment ] );
+ }, [
+ isProcessingEvaluation,
+ recommendedModules,
+ siteIsRegistered,
+ welcomeFlowExperiment.isLoading,
+ welcomeFlowExperiment.variation,
+ ] );
useEffect( () => {
if ( prevStep !== currentStep ) {
diff --git a/projects/packages/my-jetpack/changelog/add-more-eslint-rules b/projects/packages/my-jetpack/changelog/add-more-eslint-rules
deleted file mode 100644
index 2b32cb03e644c..0000000000000
--- a/projects/packages/my-jetpack/changelog/add-more-eslint-rules
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: fixed
-Comment: Fix new eslint sniffs. Should be no change in functionality.
-
-
diff --git a/projects/packages/my-jetpack/changelog/change-my-jetpack-disabled-tiers-handle b/projects/packages/my-jetpack/changelog/change-my-jetpack-disabled-tiers-handle
deleted file mode 100644
index 49cd68c2f1c58..0000000000000
--- a/projects/packages/my-jetpack/changelog/change-my-jetpack-disabled-tiers-handle
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-My Jetpack: reflect tier filters properly on product class and UI. Fix little nuances with date constructor
diff --git a/projects/packages/my-jetpack/changelog/fix-boost-score-popover b/projects/packages/my-jetpack/changelog/fix-boost-score-popover
deleted file mode 100644
index 8aaff1a860047..0000000000000
--- a/projects/packages/my-jetpack/changelog/fix-boost-score-popover
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: fixed
-
-My Jetpack: Fix the popover and active button of the Bboost card are overlapping
diff --git a/projects/packages/my-jetpack/changelog/try-no-version-bumps-in-trunk b/projects/packages/my-jetpack/changelog/try-no-version-bumps-in-trunk
deleted file mode 100644
index 91efe85c55e06..0000000000000
--- a/projects/packages/my-jetpack/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/packages/my-jetpack/package.json b/projects/packages/my-jetpack/package.json
index 3735b0ac72a5d..76706c2a685b9 100644
--- a/projects/packages/my-jetpack/package.json
+++ b/projects/packages/my-jetpack/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-my-jetpack",
- "version": "4.33.0",
+ "version": "4.33.1",
"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": {
@@ -75,7 +75,7 @@
"sass-loader": "12.4.0",
"storybook": "8.2.9",
"typescript": "5.0.4",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
}
}
diff --git a/projects/packages/my-jetpack/src/class-activitylog.php b/projects/packages/my-jetpack/src/class-activitylog.php
index 0e59226dbd508..4de90c075ded5 100644
--- a/projects/packages/my-jetpack/src/class-activitylog.php
+++ b/projects/packages/my-jetpack/src/class-activitylog.php
@@ -51,7 +51,7 @@ public static function add_submenu_jetpack() {
'manage_options',
esc_url( Redirect::get_url( 'cloud-activity-log-wp-menu', $args ) ),
null,
- 1
+ 8
);
}
}
diff --git a/projects/packages/my-jetpack/src/class-initializer.php b/projects/packages/my-jetpack/src/class-initializer.php
index b0be741ad3c7b..3e164192b9764 100644
--- a/projects/packages/my-jetpack/src/class-initializer.php
+++ b/projects/packages/my-jetpack/src/class-initializer.php
@@ -42,7 +42,7 @@ class Initializer {
*
* @var string
*/
- const PACKAGE_VERSION = '4.33.0';
+ const PACKAGE_VERSION = '4.33.1';
/**
* HTML container ID for the IDC screen on My Jetpack page.
diff --git a/projects/packages/my-jetpack/src/class-jetpack-manage.php b/projects/packages/my-jetpack/src/class-jetpack-manage.php
index be32839498d54..3a732192c90a9 100644
--- a/projects/packages/my-jetpack/src/class-jetpack-manage.php
+++ b/projects/packages/my-jetpack/src/class-jetpack-manage.php
@@ -49,7 +49,7 @@ public static function add_submenu_jetpack() {
'manage_options',
esc_url( Redirect::get_url( 'cloud-manage-dashboard-wp-menu', $args ) ),
null,
- 100
+ 15
);
}
diff --git a/projects/packages/plugin-deactivation/CHANGELOG.md b/projects/packages/plugin-deactivation/CHANGELOG.md
index b8c1a3a540873..59c5b3ee10414 100644
--- a/projects/packages/plugin-deactivation/CHANGELOG.md
+++ b/projects/packages/plugin-deactivation/CHANGELOG.md
@@ -5,6 +5,11 @@ 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.2.2] - 2024-08-29
+### Changed
+- Updated package dependencies. [#39004]
+- Updated package dependencies. [#39111]
+
## [0.2.1] - 2024-03-15
### Changed
- Internal updates.
@@ -47,6 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Added package to intercept plugin deactivation [#27081]
+[0.2.2]: https://github.com/Automattic/jetpack-plugin-deactivation/compare/v0.2.1...v0.2.2
[0.2.1]: https://github.com/Automattic/jetpack-plugin-deactivation/compare/v0.2.0...v0.2.1
[0.2.0]: https://github.com/Automattic/jetpack-plugin-deactivation/compare/v0.1.6...v0.2.0
[0.1.6]: https://github.com/Automattic/jetpack-plugin-deactivation/compare/v0.1.5...v0.1.6
diff --git a/projects/packages/plugin-deactivation/changelog/try-no-version-bumps-in-trunk b/projects/packages/plugin-deactivation/changelog/try-no-version-bumps-in-trunk
deleted file mode 100644
index 91efe85c55e06..0000000000000
--- a/projects/packages/plugin-deactivation/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/packages/plugin-deactivation/package.json b/projects/packages/plugin-deactivation/package.json
index 7a21c67011c2c..9becad3698ca9 100644
--- a/projects/packages/plugin-deactivation/package.json
+++ b/projects/packages/plugin-deactivation/package.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@automattic/jetpack-plugin-deactivation",
- "version": "0.2.1",
+ "version": "0.2.2",
"description": "Intercept plugin deactivation with a dialog",
"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/plugin-deactivation/#readme",
"bugs": {
@@ -27,7 +27,7 @@
"sass-loader": "12.4.0",
"tslib": "2.5.0",
"typescript": "5.0.4",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
}
}
diff --git a/projects/packages/plugin-deactivation/src/class-deactivation-handler.php b/projects/packages/plugin-deactivation/src/class-deactivation-handler.php
index dd0ce7517c1be..30eb420e8e29f 100644
--- a/projects/packages/plugin-deactivation/src/class-deactivation-handler.php
+++ b/projects/packages/plugin-deactivation/src/class-deactivation-handler.php
@@ -21,7 +21,7 @@ class Deactivation_Handler {
*
* @var string
*/
- const PACKAGE_VERSION = '0.2.1';
+ const PACKAGE_VERSION = '0.2.2';
/**
* Slug of the plugin to intercept deactivation for.
diff --git a/projects/packages/publicize/CHANGELOG.md b/projects/packages/publicize/CHANGELOG.md
index 3932e2d010018..7a33c43a78778 100644
--- a/projects/packages/publicize/CHANGELOG.md
+++ b/projects/packages/publicize/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).
+## [0.50.1] - 2024-08-29
+### Added
+- Added share status info to Jetpack sidebar [#39073]
+
+### Changed
+- Updated package dependencies. [#39111]
+
## [0.50.0] - 2024-08-26
### Added
- Added the new feature flag for the social share status [#39015]
@@ -666,6 +673,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated package dependencies.
- Update package.json metadata.
+[0.50.1]: https://github.com/Automattic/jetpack-publicize/compare/v0.50.0...v0.50.1
[0.50.0]: https://github.com/Automattic/jetpack-publicize/compare/v0.49.2...v0.50.0
[0.49.2]: https://github.com/Automattic/jetpack-publicize/compare/v0.49.1...v0.49.2
[0.49.1]: https://github.com/Automattic/jetpack-publicize/compare/v0.49.0...v0.49.1
diff --git a/projects/packages/publicize/changelog/add-social-share-status-info b/projects/packages/publicize/changelog/add-social-share-status-info
deleted file mode 100644
index 0d38a15639ec3..0000000000000
--- a/projects/packages/publicize/changelog/add-social-share-status-info
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: added
-
-Added share status info to Jetpack sidebar
diff --git a/projects/packages/publicize/changelog/add-social-share-status-shares-modal b/projects/packages/publicize/changelog/add-social-share-status-shares-modal
new file mode 100644
index 0000000000000..bf7d182e6814d
--- /dev/null
+++ b/projects/packages/publicize/changelog/add-social-share-status-shares-modal
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Add share status log modal to published posts
diff --git a/projects/packages/publicize/changelog/try-no-version-bumps-in-trunk b/projects/packages/publicize/changelog/try-no-version-bumps-in-trunk
deleted file mode 100644
index 91efe85c55e06..0000000000000
--- a/projects/packages/publicize/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/packages/publicize/package.json b/projects/packages/publicize/package.json
index b417481070cd8..1b8f123ea551a 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.50.0",
+ "version": "0.50.1",
"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": {
@@ -30,7 +30,7 @@
"@automattic/jetpack-webpack-config": "workspace:*",
"@wordpress/browserslist-config": "6.5.0",
"concurrently": "7.6.0",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
},
"dependencies": {
diff --git a/projects/packages/schema/CHANGELOG.md b/projects/packages/schema/CHANGELOG.md
index 411eeac18f4d6..4f89809afb93f 100644
--- a/projects/packages/schema/CHANGELOG.md
+++ b/projects/packages/schema/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] - 2024-08-29
+### Changed
+- Cleanup utils [#39025]
+
## 0.1.0 - 2024-08-22
### Added
- Initial version. [#38563]
### Changed
- Updated package dependencies. [#39004]
+
+[0.1.1]: https://github.com/Automattic/jetpack-schema/compare/v0.1.0...v0.1.1
diff --git a/projects/packages/schema/changelog/try-no-version-bumps-in-trunk b/projects/packages/schema/changelog/try-no-version-bumps-in-trunk
deleted file mode 100644
index 91efe85c55e06..0000000000000
--- a/projects/packages/schema/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/packages/schema/src/class-schema.php b/projects/packages/schema/src/class-schema.php
index a5bb133d15fa5..fe3b30f6e0be1 100644
--- a/projects/packages/schema/src/class-schema.php
+++ b/projects/packages/schema/src/class-schema.php
@@ -65,7 +65,7 @@
* $parsed_data = $my_schema->parse($input_data);
*/
class Schema {
- const PACKAGE_VERSION = '0.1.0';
+ const PACKAGE_VERSION = '0.1.1';
public static function as_string() {
return new Schema_Parser( new Type_String() );
diff --git a/projects/packages/search/changelog/add-allow-customizing-highlighted-fields b/projects/packages/search/changelog/add-allow-customizing-highlighted-fields
new file mode 100644
index 0000000000000..bc31a86a45be0
--- /dev/null
+++ b/projects/packages/search/changelog/add-allow-customizing-highlighted-fields
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Search: allow customizing highlighted fields
diff --git a/projects/plugins/social/changelog/renovate-definitelytyped b/projects/packages/search/changelog/renovate-npm-webpack-vulnerability
similarity index 100%
rename from projects/plugins/social/changelog/renovate-definitelytyped
rename to projects/packages/search/changelog/renovate-npm-webpack-vulnerability
diff --git a/projects/packages/search/changelog/update-jetpack-menu-item-order b/projects/packages/search/changelog/update-jetpack-menu-item-order
new file mode 100644
index 0000000000000..4bfbd859ba2bf
--- /dev/null
+++ b/projects/packages/search/changelog/update-jetpack-menu-item-order
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Admin menu: change order of Jetpack sub-menu items
diff --git a/projects/packages/search/package.json b/projects/packages/search/package.json
index aeca4c9411f08..c370738adde1b 100644
--- a/projects/packages/search/package.json
+++ b/projects/packages/search/package.json
@@ -91,7 +91,7 @@
"sass": "1.64.1",
"sass-loader": "12.4.0",
"size-limit": "11.1.4",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
},
"browserslist": [
diff --git a/projects/packages/search/src/dashboard/class-dashboard.php b/projects/packages/search/src/dashboard/class-dashboard.php
index 8da1e6ea86254..ac6494edc6f23 100644
--- a/projects/packages/search/src/dashboard/class-dashboard.php
+++ b/projects/packages/search/src/dashboard/class-dashboard.php
@@ -102,7 +102,8 @@ public function add_wp_admin_submenu() {
_x( 'Search', 'product name shown in menu', 'jetpack-search-pkg' ),
'manage_options',
'jetpack-search',
- array( $this, 'render' )
+ array( $this, 'render' ),
+ 10
);
} else {
// always add the page, but hide it from the menu.
diff --git a/projects/packages/search/src/instant-search/components/search-app.jsx b/projects/packages/search/src/instant-search/components/search-app.jsx
index e00e8bfc89054..58423aaa4fae4 100644
--- a/projects/packages/search/src/instant-search/components/search-app.jsx
+++ b/projects/packages/search/src/instant-search/components/search-app.jsx
@@ -229,6 +229,7 @@ class SearchApp extends Component {
sort: this.props.sort,
postsPerPage: this.props.options.postsPerPage,
adminQueryFilter: this.props.options.adminQueryFilter,
+ highlightFields: this.props.options.highlightFields,
isInCustomizer: this.props.isInCustomizer,
} );
};
diff --git a/projects/packages/search/src/instant-search/components/search-result-expanded.jsx b/projects/packages/search/src/instant-search/components/search-result-expanded.jsx
index 7bb2af8a23cb7..c712740a56c40 100644
--- a/projects/packages/search/src/instant-search/components/search-result-expanded.jsx
+++ b/projects/packages/search/src/instant-search/components/search-result-expanded.jsx
@@ -89,7 +89,16 @@ export default function SearchResultExpanded( props ) {
className="jetpack-instant-search__search-result-expanded__content"
//eslint-disable-next-line react/no-danger
dangerouslySetInnerHTML={ {
- __html: highlight.content.join( ' ... ' ),
+ __html:
+ highlight && typeof highlight === 'object'
+ ? Object.entries( highlight )
+ .filter(
+ ( [ key, value ] ) =>
+ key !== 'comments' && key !== 'title' && Array.isArray( value )
+ )
+ .map( ( [ , array ] ) => array.join( ' ... ' ) )
+ .join( ' ... ' )
+ : '',
} }
/>
diff --git a/projects/packages/search/src/instant-search/components/search-result-minimal.jsx b/projects/packages/search/src/instant-search/components/search-result-minimal.jsx
index 7e0adff204a37..46739b9af523b 100644
--- a/projects/packages/search/src/instant-search/components/search-result-minimal.jsx
+++ b/projects/packages/search/src/instant-search/components/search-result-minimal.jsx
@@ -87,7 +87,16 @@ class SearchResultMinimal extends Component {
className="jetpack-instant-search__search-result-minimal-content"
//eslint-disable-next-line react/no-danger
dangerouslySetInnerHTML={ {
- __html: this.props.result.highlight.content.join( ' ... ' ),
+ __html:
+ this.props.result.highlight && typeof this.props.result.highlight === 'object'
+ ? Object.entries( this.props.result.highlight )
+ .filter(
+ ( [ key, value ] ) =>
+ key !== 'comments' && key !== 'title' && Array.isArray( value )
+ )
+ .map( ( [ , array ] ) => array.join( ' ... ' ) )
+ .join( ' ... ' )
+ : '',
} }
/>
);
@@ -98,7 +107,13 @@ class SearchResultMinimal extends Component {
if ( result_type !== 'post' ) {
return null;
}
- const noMatchingContent = ! highlight.content || highlight.content[ 0 ] === '';
+ const noMatchingContent =
+ ! highlight ||
+ typeof highlight !== 'object' ||
+ Object.entries( highlight ).every(
+ ( [ key, value ] ) =>
+ key === 'comments' || key === 'title' || ! Array.isArray( value ) || value[ 0 ] === ''
+ );
return (
+
+ { fairUsageNotice }
+
+ ) }
{ /* Mock BlockCard component styles to keep alignment */ }
@@ -360,11 +371,14 @@ export default function AIAssistantEdit( { attributes, setAttributes, clientId,
{ __( 'Discover all features', 'jetpack' ) }
-
+
{ feature !== SPELLING_MISTAKES.name && hasSuggestions && (
) ) }
+
+
+ { feature === SPELLING_MISTAKES.name && (
+
+ ) }
-
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/highlight/style.scss b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/highlight/style.scss
index 5c6097308e4ca..dec5b67a664c5 100644
--- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/highlight/style.scss
+++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/highlight/style.scss
@@ -32,8 +32,13 @@
&.jetpack-ai-breve__has-suggestions {
align-items: flex-start;
- padding-top: 8px;
- gap: 8px;
+
+ .jetpack-ai-breve__suggestions-container {
+ max-height: calc( 200px - 32px ); // 32px is the height of the helper buttons wrapper
+ overflow-y: auto;
+ overflow-x: hidden;
+ padding: 3px 0; // Space for the focus highlight
+ }
}
.jetpack-ai-breve__header-container {
@@ -41,6 +46,7 @@
width: 100%;
justify-content: space-between;
gap: 32px;
+ height: 40px;
.jetpack-ai-breve__title,
.jetpack-ai-breve__action {
@@ -75,17 +81,27 @@
padding-top: 0px;
padding-bottom: 0px;
padding-right: 0px;
- height: unset;
+ height: 24px;
& > svg,
path {
fill: #0277a8;
}
}
+
+ .jetpack-ai-breve__loading {
+ height: 24px;
+ display: flex;
+ align-items: center;
+
+ svg {
+ margin-top: 0;
+ }
+ }
}
}
- .jetpack-ai-breve__bottom-container {
+ .jetpack-ai-breve__suggestions-container {
display: flex;
flex-direction: column;
border-top: 1px solid #dcdcde;
@@ -101,30 +117,6 @@
}
}
- .jetpack-ai-breve__helper {
- padding: 4px 8px;
- background-color: #f6f7f7;
- white-space: nowrap;
- color: #646970;
- margin: 4px;
- border-radius: 4px;
- font-size: 12px;
- display: flex;
- justify-content: space-between;
- align-items: center;
- gap: 8px;
-
- .jetpack-ai-breve__helper-buttons-wrapper {
- display: flex;
- gap: 16px;
- }
-
- .components-button {
- padding: 0px;
- color: #646970;
- }
- }
-
.components-button.is-tertiary {
color: #000000;
white-space: break-spaces;
@@ -137,5 +129,30 @@
line-height: 20px;
}
}
+
+ .jetpack-ai-breve__helper {
+ padding: 4px 8px;
+ background-color: #f6f7f7;
+ white-space: nowrap;
+ color: #646970;
+ margin: 4px;
+ border-radius: 4px;
+ font-size: 12px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ gap: 8px;
+ width: calc( 100% - 8px );
+
+ .jetpack-ai-breve__helper-buttons-wrapper {
+ display: flex;
+ gap: 16px;
+ }
+
+ .components-button {
+ padding: 0px;
+ color: #646970;
+ }
+ }
}
}
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/FleschKincaidUtils.js b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/FleschKincaidUtils.ts
similarity index 73%
rename from projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/FleschKincaidUtils.js
rename to projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/FleschKincaidUtils.ts
index fb0de09ed02b1..d08cc101493cb 100644
--- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/FleschKincaidUtils.js
+++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/FleschKincaidUtils.ts
@@ -1,12 +1,12 @@
-const countWords = text => {
+const countWords = ( text: string ) => {
return text.split( /\s+/ ).filter( word => word.length > 0 ).length;
};
-const countSentences = text => {
+const countSentences = ( text: string ) => {
return text.split( /[.!?]+/ ).filter( sentence => sentence.length > 0 ).length;
};
-const countSyllables = word => {
+const countSyllables = ( word: string ) => {
if ( word.length <= 3 ) {
return 1;
}
@@ -21,11 +21,11 @@ const countSyllables = word => {
return syllables ? syllables.length : 1;
};
-const countTotalSyllables = text => {
+const countTotalSyllables = ( text: string ) => {
return text.split( /\s+/ ).reduce( ( total, word ) => total + countSyllables( word ), 0 );
};
-const fleschKincaidGrade = ( words, sentences, syllables ) => {
+const fleschKincaidGrade = ( words: number, sentences: number, syllables: number ) => {
if ( words === 0 || sentences === 0 ) {
return null;
}
@@ -33,7 +33,7 @@ const fleschKincaidGrade = ( words, sentences, syllables ) => {
return 0.39 * ( words / sentences ) + 11.8 * ( syllables / words ) - 15.59;
};
-const calculateFleschKincaid = text => {
+const calculateFleschKincaid = ( text: string ) => {
const words = countWords( text );
const sentences = countSentences( text );
const syllables = countTotalSyllables( text );
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/escapeRegExp.js b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/escapeRegExp.ts
similarity index 53%
rename from projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/escapeRegExp.js
rename to projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/escapeRegExp.ts
index d22279c125399..733295ea3a8ed 100644
--- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/escapeRegExp.js
+++ b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/escapeRegExp.ts
@@ -1,3 +1,3 @@
-export const escapeRegExp = string => {
+export const escapeRegExp = ( string: string ) => {
return string.replace( /[.*+?^${}()|[\]\\/]/g, '\\$&' );
};
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/getClientId.js b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/getClientId.js
deleted file mode 100644
index 411ffaae84976..0000000000000
--- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/getClientId.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export const getClientId = element => {
- if ( ! element ) {
- return null;
- }
-
- const clientId = element.getAttribute( 'data-block' );
-
- if ( clientId ) {
- return clientId;
- }
-
- return getClientId( element.parentElement );
-};
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/getHighlightRects.js b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/getHighlightRects.js
deleted file mode 100644
index a32f3a4749ece..0000000000000
--- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/getHighlightRects.js
+++ /dev/null
@@ -1,96 +0,0 @@
-import config from '../dictionaries/dictionaries-config';
-import { escapeRegExp } from './escapeRegExp';
-
-const getWordRects = ( content, regex ) => {
- const ranges = [];
- const nodeIterator = document.createNodeIterator( content, window.NodeFilter.SHOW_TEXT );
- let currentNode;
- while ( ( currentNode = nodeIterator.nextNode() ) ) {
- let match;
- while ( ( match = regex.exec( currentNode.nodeValue ) ) ) {
- const range = document.createRange();
- range.setStart( currentNode, match.index );
- range.setEnd( currentNode, match.index + match[ 0 ].length );
- ranges.push( { range, text: match[ 0 ] } );
- }
- }
- return ranges;
-};
-
-export const getHighlightRects = element => {
- const rects = [];
- const textContent = element.innerText || element.textContent;
-
- const allRanges = [];
-
- for ( const key in config.dictionaries ) {
- const dictConfig = config.dictionaries[ key ];
- if ( dictConfig.type === 'function' ) {
- const ranges = dictConfig
- .function( textContent )
- .map( ( { regex } ) => getWordRects( element, regex ) )
- .flat();
- allRanges.push( ...ranges );
- } else {
- const dictionary = dictConfig.dictionary;
- let regex;
- if ( dictConfig.type === 'key-value' ) {
- regex = new RegExp(
- `\\b(${ Object.keys( dictionary ).map( escapeRegExp ).join( '|' ) })\\b`,
- 'gi'
- );
- } else if ( dictConfig.type === 'list' ) {
- regex = new RegExp( `\\b(${ dictionary.map( escapeRegExp ).join( '|' ) })\\b`, 'gi' );
- }
- const ranges = getWordRects( element, regex );
- allRanges.push( ...ranges );
- }
- }
-
- allRanges.forEach( ( { range, text } ) => {
- const clientRects = Array.from( range.getClientRects() );
- clientRects.forEach( ( rect, rangeIndex ) => {
- let type;
- let replacement = text.toLowerCase();
-
- for ( const key in config.dictionaries ) {
- const dictConfig = config.dictionaries[ key ];
- if ( dictConfig.type === 'key-value' && dictConfig.dictionary[ text.toLowerCase() ] ) {
- type = key;
- replacement = dictConfig.dictionary[ text.toLowerCase() ];
- break;
- } else if (
- dictConfig.type === 'list' &&
- dictConfig.dictionary.includes( text.toLowerCase() )
- ) {
- type = key;
- break;
- } else if ( dictConfig.type === 'function' && key === 'long-sentence' ) {
- const longSentences = dictConfig
- .function( textContent )
- .map( ( { sentence } ) => sentence );
- if ( longSentences.includes( text ) ) {
- type = key;
- break;
- }
- }
- }
-
- if ( ! type ) {
- type = 'phrase';
- }
-
- rects.push( {
- rect,
- rangeIndex,
- range,
- target: `${ text }`, // The original text
- replacement, // It's replacement
- type,
- highlightId: `${ range.startOffset }${ text }${ range.endOffset }`,
- } );
- } );
- } );
-
- return rects;
-};
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/handleMessage.js b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/handleMessage.js
deleted file mode 100644
index 18780d7294e71..0000000000000
--- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/handleMessage.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { select, dispatch } from '@wordpress/data';
-
-export const findBlockRecursively = ( clientId, blocks ) => {
- const block = blocks.find( currentBlock => currentBlock.clientId === clientId );
-
- if ( block ) {
- return block;
- }
-
- // If the block was not found, check the inner blocks
- for ( const currentBlock of blocks ) {
- if ( currentBlock.innerBlocks?.length > 0 ) {
- const innerBlock = findBlockRecursively( clientId, currentBlock.innerBlocks );
-
- if ( innerBlock ) {
- return innerBlock;
- }
- }
- }
-
- return null;
-};
-
-// messageHandler.js
-export const handleMessage = event => {
- const { clientId, aiReplacementText, updateFunc } = event;
- const { getBlocks } = select( 'core/block-editor' );
- const { selectBlock, updateBlockAttributes } = dispatch( 'core/block-editor' );
-
- const updateBlocks = attributes => {
- selectBlock( clientId );
- updateBlockAttributes( clientId, attributes );
- };
-
- const block = findBlockRecursively( clientId, getBlocks() );
-
- if ( block ) {
- updateBlocks( { content: aiReplacementText } );
- updateFunc();
- }
-};
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/requestAnimationFrame.js b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/requestAnimationFrame.js
deleted file mode 100644
index 6c9b3c5a00298..0000000000000
--- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/requestAnimationFrame.js
+++ /dev/null
@@ -1 +0,0 @@
-export const requestAnimationFrame = window.requestAnimationFrame || ( cb => cb() );
diff --git a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/textEditingHelpers.js b/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/textEditingHelpers.js
deleted file mode 100644
index 220a50a66deab..0000000000000
--- a/projects/plugins/jetpack/extensions/plugins/ai-assistant-plugin/components/breve/utils/textEditingHelpers.js
+++ /dev/null
@@ -1,106 +0,0 @@
-import { requestAnimationFrame } from './requestAnimationFrame';
-
-export const saveCaretPosition = ( containerEl, caretPositionRef ) => {
- const selection = containerEl.ownerDocument.defaultView.getSelection();
-
- if ( selection.rangeCount > 0 ) {
- const range = selection.getRangeAt( 0 );
- const preCaretRange = range.cloneRange();
- preCaretRange.selectNodeContents( range.startContainer );
- preCaretRange.setEnd( range.startContainer, range.startOffset );
- const caretOffset = preCaretRange.toString().length;
-
- caretPositionRef.current = {
- container: range.startContainer,
- offset: caretOffset,
- };
- }
-};
-
-export const restoreCaretPosition = ( containerEl, caretPositionRef ) => {
- const { container, offset } = caretPositionRef.current || {};
-
- if ( container && typeof offset === 'number' ) {
- const range = containerEl.ownerDocument.createRange();
- const selection = containerEl.ownerDocument.defaultView.getSelection();
- range.setStart( container, offset );
- range.collapse( true );
- selection.removeAllRanges();
- selection.addRange( range );
- }
-};
-
-export const getChildTextNodes = element => {
- const textNodes = [];
-
- for ( let i = 0; i < element.childNodes.length; i++ ) {
- const childNode = element.childNodes[ i ];
-
- if ( childNode.nodeType === Node.TEXT_NODE ) {
- textNodes.push( childNode );
- } else if ( childNode.nodeType === Node.ELEMENT_NODE ) {
- const childNodeTextNodes = getChildTextNodes( childNode );
- textNodes.push( ...childNodeTextNodes );
- }
- }
-
- return textNodes;
-};
-
-export const simulateClick = ( event, blockElement ) => {
- blockElement.focus();
-
- requestAnimationFrame( () => {
- const selectedText = blockElement.ownerDocument.getSelection();
- const clickRange = blockElement.ownerDocument.createRange();
- const textNodes = getChildTextNodes( blockElement );
-
- // Get the mouse click position relative to the block
- const clickRect = blockElement.getBoundingClientRect();
- const x = event.clientX - clickRect.left;
-
- // Translate event.nativeEvent.pageY to local block coordinate
- const y =
- event.nativeEvent.pageY -
- blockElement.ownerDocument.documentElement.scrollTop -
- clickRect.top;
-
- // Get the text node and determine the character offset based on the click position
- let offset = 0;
- let accumulatedWidth = 0;
-
- // Create a temporary range to measure text width
- let textNode;
-
- for ( let i = 0; i < textNodes.length; i++ ) {
- textNode = textNodes[ i ];
-
- for ( let j = 0; j < textNode.textContent.length; j++ ) {
- clickRange.setStart( textNode, j );
- clickRange.setEnd( textNode, j + 1 );
- const charRect = clickRange.getBoundingClientRect();
-
- if ( y >= charRect.top - clickRect.top && y <= charRect.bottom - clickRect.top ) {
- accumulatedWidth += charRect.width;
- // If x is between the accumulated width minus half the character width and the full accumulated width, then the click is closer to the next character
- if ( x >= accumulatedWidth - charRect.width / 2 && x <= accumulatedWidth ) {
- offset = j + 1;
- break;
- }
- // if x is less than the accumulated width, then the click is closer to the previous character
- else if ( x < accumulatedWidth ) {
- offset = j;
- break;
- }
- }
- }
- }
-
- // Set the caret at the exact position where the click occurred
- clickRange.setStart( textNode, offset );
- clickRange.collapse( true );
-
- selectedText.removeAllRanges();
- selectedText.addRange( clickRange );
- } );
-};
diff --git a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-v1-2-endpoint.php b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-v1-2-endpoint.php
index 56b87ca7513d0..7baf274254fd5 100644
--- a/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-v1-2-endpoint.php
+++ b/projects/plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-v1-2-endpoint.php
@@ -1002,6 +1002,9 @@ private function dtp_fb_preprocess_post( $post, $metadata ) {
'title' => $fb_point['name'],
);
}
+ if ( ! function_exists( 'map_block_from_geo_points' ) ) {
+ require_once JETPACK__PLUGIN_DIR . 'extensions/blocks/map/map.php';
+ }
$map_block = map_block_from_geo_points( $geo_points );
$post['post_content'] = $map_block . $post['post_content'];
diff --git a/projects/plugins/jetpack/modules/memberships/class-jetpack-memberships.php b/projects/plugins/jetpack/modules/memberships/class-jetpack-memberships.php
index 30619a296ef1f..70e1567f3c036 100644
--- a/projects/plugins/jetpack/modules/memberships/class-jetpack-memberships.php
+++ b/projects/plugins/jetpack/modules/memberships/class-jetpack-memberships.php
@@ -148,6 +148,14 @@ public static function clear_post_access_level_cache() {
'PLN' => 2.0,
'SEK' => 3.0,
'SGD' => 0.5,
+ 'CZK' => 15.0,
+ 'HUF' => 175.0,
+ 'TWD' => 10.0,
+ 'IDR' => 0,
+ 'ILS' => 0,
+ 'PHP' => 0,
+ 'RUB' => 0,
+ 'TRY' => 0,
);
/**
diff --git a/projects/plugins/jetpack/modules/scan/class-admin-sidebar-link.php b/projects/plugins/jetpack/modules/scan/class-admin-sidebar-link.php
index 925b1050b0ca9..2c78af6ba64e5 100644
--- a/projects/plugins/jetpack/modules/scan/class-admin-sidebar-link.php
+++ b/projects/plugins/jetpack/modules/scan/class-admin-sidebar-link.php
@@ -7,6 +7,7 @@
namespace Automattic\Jetpack\Scan;
+use Automattic\Jetpack\Admin_UI\Admin_Menu;
use Automattic\Jetpack\My_Jetpack\Products\Backup;
use Automattic\Jetpack\Redirect;
use Automattic\Jetpack\Status\Host;
@@ -68,22 +69,37 @@ public function maybe_add_admin_link() {
}
if ( $this->should_show_scan() ) {
- $menu_label = __( 'Scan', 'jetpack' );
- $url = Redirect::get_url( 'calypso-scanner' );
- add_submenu_page( 'jetpack', $menu_label, esc_html( $menu_label ) . ' ', 'manage_options', esc_url( $url ), null, $this->get_link_offset() );
+ Admin_Menu::add_menu(
+ __( 'Scan', 'jetpack' ),
+ __( 'Scan', 'jetpack' ) . ' ',
+ 'manage_options',
+ esc_url( Redirect::get_url( 'cloud-scan-history-wp-menu' ) ),
+ null,
+ $this->get_link_offset()
+ );
}
// Add scan item which shows history page only. This is mutally exclusive from the scan item above and is only shown for Atomic sitse.
if ( $this->should_show_scan_history_only() ) {
- $menu_label = __( 'Scan', 'jetpack' );
- $url = Redirect::get_url( 'cloud-scan-history-wp-menu' );
- add_submenu_page( 'jetpack', $menu_label, esc_html( $menu_label ) . ' ', 'manage_options', esc_url( $url ), null, $this->get_link_offset() );
+ Admin_Menu::add_menu(
+ __( 'Scan', 'jetpack' ),
+ __( 'Scan', 'jetpack' ) . ' ',
+ 'manage_options',
+ esc_url( Redirect::get_url( 'cloud-scan-history-wp-menu' ) ),
+ null,
+ $this->get_link_offset()
+ );
}
if ( $this->should_show_backup() ) {
- $menu_label = __( 'VaultPress', 'jetpack' );
- $url = Redirect::get_url( 'calypso-backups' );
- add_submenu_page( 'jetpack', $menu_label, esc_html( $menu_label ) . ' ', 'manage_options', esc_url( $url ), null, $this->get_link_offset() );
+ Admin_Menu::add_menu(
+ __( 'VaultPress', 'jetpack' ),
+ __( 'VaultPress', 'jetpack' ) . ' ',
+ 'manage_options',
+ esc_url( Redirect::get_url( 'calypso-backups' ) ),
+ null,
+ $this->get_link_offset()
+ );
}
}
@@ -96,7 +112,7 @@ public function maybe_add_admin_link() {
*/
private function get_link_offset() {
global $submenu;
- $offset = 0;
+ $offset = 9;
if ( ! array_key_exists( 'jetpack', $submenu ) ) {
return $offset;
diff --git a/projects/plugins/jetpack/modules/subscriptions.php b/projects/plugins/jetpack/modules/subscriptions.php
index a67cb3fd27148..87801f8868919 100644
--- a/projects/plugins/jetpack/modules/subscriptions.php
+++ b/projects/plugins/jetpack/modules/subscriptions.php
@@ -15,6 +15,7 @@
// phpcs:disable Universal.Files.SeparateFunctionsFromOO.Mixed -- TODO: Move classes to appropriately-named class files.
+use Automattic\Jetpack\Admin_UI\Admin_Menu;
use Automattic\Jetpack\Connection\Manager as Connection_Manager;
use Automattic\Jetpack\Connection\XMLRPC_Async_Call;
use Automattic\Jetpack\Redirect;
@@ -1000,13 +1001,13 @@ public function add_subscribers_menu() {
array( 'site' => $blog_id ? $blog_id : $status->get_site_suffix() )
);
- add_submenu_page(
- 'jetpack',
- esc_attr__( 'Subscribers', 'jetpack' ),
+ Admin_Menu::add_menu(
+ __( 'Subscribers', 'jetpack' ),
__( 'Subscribers', 'jetpack' ) . ' ',
'manage_options',
esc_url( $link ),
- null
+ null,
+ 11
);
}
diff --git a/projects/plugins/jetpack/package.json b/projects/plugins/jetpack/package.json
index b21e808d0eb26..604eec2436e21 100644
--- a/projects/plugins/jetpack/package.json
+++ b/projects/plugins/jetpack/package.json
@@ -113,7 +113,7 @@
"swiper": "6.7.0",
"tinycolor2": "1.4.2",
"tus-js-client": "2.3.0",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
},
"devDependencies": {
diff --git a/projects/plugins/migration/changelog/renovate-npm-webpack-vulnerability b/projects/plugins/migration/changelog/renovate-npm-webpack-vulnerability
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/plugins/migration/changelog/renovate-npm-webpack-vulnerability
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/plugins/migration/package.json b/projects/plugins/migration/package.json
index cf19140aa39ed..ea87c0affcfbc 100644
--- a/projects/plugins/migration/package.json
+++ b/projects/plugins/migration/package.json
@@ -49,7 +49,7 @@
"concurrently": "7.6.0",
"sass": "1.64.1",
"sass-loader": "12.4.0",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
}
}
diff --git a/projects/plugins/protect/changelog/renovate-npm-webpack-vulnerability b/projects/plugins/protect/changelog/renovate-npm-webpack-vulnerability
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/plugins/protect/changelog/renovate-npm-webpack-vulnerability
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/plugins/protect/changelog/update-jetpack-menu-item-order b/projects/plugins/protect/changelog/update-jetpack-menu-item-order
new file mode 100644
index 0000000000000..4bfbd859ba2bf
--- /dev/null
+++ b/projects/plugins/protect/changelog/update-jetpack-menu-item-order
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Admin menu: change order of Jetpack sub-menu items
diff --git a/projects/plugins/protect/package.json b/projects/plugins/protect/package.json
index 132e63bbbc6ce..639e586f71945 100644
--- a/projects/plugins/protect/package.json
+++ b/projects/plugins/protect/package.json
@@ -57,7 +57,7 @@
"sass": "1.64.1",
"sass-loader": "12.4.0",
"typescript": "5.0.4",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
}
}
diff --git a/projects/plugins/protect/src/class-jetpack-protect.php b/projects/plugins/protect/src/class-jetpack-protect.php
index 300886a9bed03..b2db8472267ea 100644
--- a/projects/plugins/protect/src/class-jetpack-protect.php
+++ b/projects/plugins/protect/src/class-jetpack-protect.php
@@ -156,7 +156,8 @@ public function admin_page_init() {
$menu_label,
'manage_options',
'jetpack-protect',
- array( $this, 'plugin_settings_page' )
+ array( $this, 'plugin_settings_page' ),
+ 5
);
add_action( 'load-' . $page_suffix, array( $this, 'enqueue_admin_scripts' ) );
diff --git a/projects/plugins/social/CHANGELOG.md b/projects/plugins/social/CHANGELOG.md
index 0f66218a0ce1f..a65d961faf62a 100644
--- a/projects/plugins/social/CHANGELOG.md
+++ b/projects/plugins/social/CHANGELOG.md
@@ -5,57 +5,97 @@ 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).
+## 5.2.0 - 2024-08-29
+
+### Changed
+
+- Admin menu: change order of Jetpack sub-menu items [#39095]
+- Moved PostPublishPanels component to publicize-components package [#39049]
+- Social: Migrated shares data to the new script data [#38988]
+- Social: Updated intial state logic to use the new consolidated initial state [#38606]
+- Social: Updated the share status modal to render it globally [#39116]
+- Update composer lock file [#38942]
+- Updated package dependencies. [#38662] [#38665] [#38822] [#38822] [#39111]
+
+### Removed
+
+- Remove the unused Advanced plan nudge [#38926]
+- Social: Removed share limits UI and data logic [#38904]
+
+### Fixed
+
+- Revert recent SVG image optimizations. [#38981]
+
## 5.1.0 - 2024-08-08
+
### Added
+
- Added feature flag management for social [#38669]
### Fixed
+
- Lossless image optimization of images in projects/plugins [subdirectories from a* through social] [#38573]
## 5.0.0 - 2024-08-01
+
### Changed
+
- Social: Removed unnecessary feature checks for social connections [#38216]
- Updated package dependencies. [#38228] [#38235] [#38464]
### Removed
+
- General: update WordPress version requirements to WordPress 6.5. [#38382]
- Removed the unused code for image auto-conversion from social store [#38609]
- Social | Removed the media auto-conversion UI [#38497]
## 4.5.2 - 2024-07-03
+
### Changed
+
- General: indicate compatibility with the upcoming version of WordPress - 6.6. [#37962]
- Updated package dependencies. [#37917] [#38132]
### Fixed
+
- Fixed E2E tests navigating to block editor [#37875]
- Fixed the admin page pricing table not shown [#37877]
- Social: Fixed broken connections reconnect link to point it to new connections UI [#37869]
## 4.5.1 - 2024-06-18
+
### Fixed
+
- My Jetpack: Update My Jetpack to a more stable version. [#37911]
## 4.5.0 - 2024-06-13
+
### Changed
+
- Move the admin upsell to the toggle section [#37731]
- Updated package dependencies. [#37767] [#37776] [#37796]
### Removed
+
- Removed the social basic plan from the admin page [#36846]
### Fixed
+
- Updated wp.org screenshots [#37726]
## 4.4.0 - 2024-06-05
+
### Changed
+
- Social | Removed the top "Connect accounts" on the admin page [#37697]
- Social | Updated upgrade nudges to use the new plan [#37638]
- Updated package dependencies. [#37669]
- Updated the editor nudge text and logic [#37644]
## 4.3.0 - 2024-05-29
+
### Added
+
- Add connect form/button for connection management [#37196]
- Added a CTA button to create a social note [#36972]
- Added and rendered GlobalNotices component [#37237]
@@ -69,6 +109,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Social Limits: Added clarification of cycle reset [#37350]
### Changed
+
- 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]
- Remove explicit Plugin Install package dependency. [#37430]
@@ -78,12 +119,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Update the Social sidebar share post panel to direct non-admin authors to user connection if there is no user connection. [#36976]
### Fixed
+
- Adjusted the webpack config so the social icon colours are picked up by PostCSS [#37327]
- Fixed CSS variables not loaded for modals on Social admin page [#37391]
- Fixed timeouts in E2E tests [#37045]
## 4.2.0 - 2024-04-11
+
### Added
+
- Added functions to display share urls [#36328]
- Added options and UI for link formatting [#36671]
- Added support for comments on Social Notes [#36428]
@@ -91,6 +135,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Trigger red bubble notification when bad install is detected [#36449]
### Changed
+
- Allow multiple paragraphs for Social Notes [#36522]
- Only show custom media picker for normal posts [#36640]
- Only show installation errors on plugins page [#36390]
@@ -101,11 +146,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Update to the most recent version of the @automattic/calypso-color-schemes package. [#36227]
### Fixed
+
- Fixed typos [#36554]
- Prevent enqueuing of admin styles on the frontend [#36552]
## 4.1.0 - 2024-03-07
+
### Added
+
- Added a template lock to our Social Note CPT [#35619]
- Added endpoint to update post meta [#35822]
- Added feature support for the new CPT to support activitypub. [#35442]
@@ -117,6 +165,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Social: Added archive page support to notes [#35592]
### Changed
+
- Changed the admin page 'Write a post' button to primary if the site has connections [#36031]
- General: indicate compatibility with the upcoming version of WordPress, 6.5. [#35820]
- Social Notes: Added the post list enhancements [#35819]
@@ -127,11 +176,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Use Blog ID in links to WPCOM instead of site slug. [#35006]
### Fixed
+
- Fixed no title from showing up in og:title [#35624]
- Fixed og:title having word-breaks. [#36068]
## 4.0.0 - 2024-01-18
+
### Changed
+
- Changed dismissed notices endpoint to be a core endpoint [#34544]
- Social: Changed the illustration on the admin page [#34454]
- Social: Refactored storing of feature options to use core functions [#34113]
@@ -141,16 +193,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated the design for Quick Share buttons and fixed its a11y [#34754]
### Fixed
+
- Fixed a bug with the initial state script [#34861]
- Fixed Jetpack Social scheduled post messaging [#34182]
## 3.0.0 - 2023-12-06
+
### Added
+
- Added a new post-publish panel for quick sharing [#33231]
- Added Nextdoor to Social Previews [#33907]
- Added traking for social sharing buttons [#33231]
### Changed
+
- Code Modernization: Replace usage of strpos() with str_contains() [#34137]
- General: updated PHP requirement to PHP 7.0+ [#34126]
- General: update WordPress version requirements to WordPress 6.3 and compatible with 6.4. [#34127] [#33776]
@@ -159,19 +215,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated Social admin pricing page [#33176]
### Removed
+
- Removed unused code [#34111] [#34241]
### Fixed
+
- Fixed an issue where initial state is not in sync [#33969]
- Fixed broken connections UI [#34391]
- Fixed pre-publish UI reactivity for Jetpack Social [#34243]
- Fixed the issue of publicize remaining ON after the post is published [#34289]
## 2.3.0 - 2023-09-20
+
### Added
+
- Add the change settings logic in Social for the auto conversion feature. [#32712]
### Changed
+
- Changed logic that disables the connections based on the auto-conversion feature. [#32671]
- General: remove WP 6.1 backwards compatibility checks. [#32772]
- General: update WordPress version requirements to WordPress 6.2. [#32762]
@@ -180,7 +241,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated package dependencies. [#33001]
## 2.2.0 - 2023-08-23
+
### Added
+
- Add admin-page upsell notice [#32128]
- Add new nudge in the editor to upgrade to the Advanced plan that will appear every 3 months [#32087]
- Add SIG toggle for Jetpack Settings [#32475]
@@ -188,6 +251,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add check for checking if user is on Basic plan [#32112]
### Changed
+
- Changed JITM so it can be properly dismissed. [#32033]
- Jetpack editor extensions: use shared component for the logo. [#32257]
- Moved store to publicize-components package. [#32317]
@@ -196,84 +260,109 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Use a new method to render Connection initial state. [#32499]
### Fixed
+
- Fixed checkout link so it's not siteless. [#32254]
## 2.1.0 - 2023-08-01
+
### Changed
+
- General: indicate full compatibility with the latest version of WordPress, 6.3. [#31910]
- Refactor TemplatePicker component, so inner part can be use in it's own without a modal. [#31740]
- Social: Update the screenshots to reflect the current UI [#31832]
- Updated package dependencies. [#31659, #31661, #31769, #31785, #31872, #31923, #32040]
### Fixed
+
- Fix admin page unit test [#31417]
## 2.0.0 - 2023-07-05
+
### Added
+
- Add authentication to Zendesk chat widget. [#31339]
### Changed
+
- Social: change the admin page plan redirect link. [#31195]
- Social: update the Readme to better reflect new features. [#31686]
- Updated package dependencies.
### Fixed
+
- Social: fix the connection state to ensure that new connections are disabled by default when there are no shares left. [#31168]
- Social Review Prompt: fix the state so it is shown when Jetpack is also active. [#31456]
## 1.11.0 - 2023-06-06
+
### Added
+
- Added feature flag for Mastodon preview [#30919]
- Jetpack Social: Add a notice to let users know Instagram is available [#30777]
### Changed
+
- Remove conditional rendering from zendesk chat widget component due to it being handled by an api endpoint now [#29942]
- Updated package dependencies.
- Updates the enhanced publishing feature check [#29881]
### Deprecated
+
- Minor changes around upcoming functionality change in Twitter. [#30272]
## 1.10.0 - 2023-05-02
+
### Added
+
- Social: Updating plugin version. [#30158]
### Changed
+
- Added dynamic pricing to Social admin page. [#30105]
- Updated package dependencies. [#29565, #29854, #29857, #30019]
- Update WordPress version requirements. Now requires version 6.1. [#30120]
### Fixed
+
- Dashboard: ensure the link to the post editor works, even when WordPress is installed in a subdirectory. [#30159]
- Jetpack Social: Render Social Image Generator panel even when SIG's default is disabled [#30358]
- Temporarily removed review prompts to fix the plugin's UI state. [#30101]
## 1.9.1 - 2023-04-06
+
### Fixed
+
- Reinstated is_social_image_generator_enabled for backwards compatibility. [#29952]
## 1.9.0 - 2023-04-04
+
### Added
+
- (Backup, Boost, Search, Social) Add links on upgrade pages to activate a license key, if you already have one. [#29443]
- Added option for CUT component to have a tooltip. [#29609]
- Added SIG image to the post media array if it's enabled. [#29093]
- Added toggle to Social admin page to enable or disable Social Image Generator as well as an option to pick a default template. [#29722]
### Changed
+
- General: indicate full compatibility with the latest version of WordPress, 6.2. [#29341]
- Jetpack Social: Enable Social Image Generator by default when it's available. [#29742]
- Refactored the ToggleSection component to decouple it from other logic. [#29619]
- Updated package dependencies. [#29216, #29289, #29297, #29434, #29471, #29480]
### Other changes
+
- Updated composer.lock. [#29762]
## 1.8.0 - 2023-03-07
+
### Added
+
- Add Social Image Generator editor panel to post sidebar [#28737]
- Add Social Image Generator feature flag to Jetpack Social [#29001]
### Changed
+
- Changed remaining shares phrasing [#28688]
- Remove `ci.targets` from package.json. Better scoping of e2e tests. [#28913]
- Update billing language [#29126]
@@ -281,67 +370,90 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Update to React 18. [#28710]
### Fixed
+
- Revise Jetpack connection agreement text to comply with our User Agreement [#28403]
- Use External Link icons for external links [#28922]
## 1.7.0 - 2023-02-07
+
### Added
+
- Added Advanced Social plan to pricing table [#28258]
### Changed
+
- Moved resharing to be available in the free plan [#28661]
- Updated package dependencies.
- Update playwright dependency [#28094]
- Use `flex-end` instead of `end` for better browser compatibility. [#28530]
## 1.6.0 - 2023-01-10
+
### Added
+
- Add a review request prompt for Jetpack Social plugin. [#28072]
- Add simple JS React test. [#27122]
- Add the adminUrl to the initial editor state. [#27617]
- Redirect to admin page on plugin activation, and add link to admin page from plugins page. [#24586]
### Changed
+
- Updated package dependencies. [#27340, #27688, #27689, #27696, #27697, #27874, #27887, #27916, #27962]
## 1.5.1 - 2022-12-06
+
### Changed
+
- Updated package dependencies. [#26069]
### Fixed
+
- Fix alignment issues on social admin page [#27146]
## 1.5.0 - 2022-11-08
+
### Changed
+
- Compatibility: WordPress 6.1 compatibility [#27084]
### Other changes
+
- Social: Updated the plugin versions to start the new cycle [#27114]
- Updated package dependencies. [#27182, #27196, #27278, #27289]
## 1.5.0-beta - 2022-10-27
+
### Added
+
- Display broken connections to user in editor [#25803]
- Integrate the ConnectionError react component to the Social plugin. [#26904]
- Reshare: Added the reshare UI to the block editor extension [#25993]
### Changed
+
- Updated package dependencies. [#25993, #26640, #26683, #26705, #26716, #26790, #26791, #26808, #26826, #26829, #26851, #27089]
### Fixed
+
- Social: Fix the connection test endpoint URL [#26892]
- Social: Fix the path to the connections URL in the editor [#26932]
## 1.4.2 - 2022-10-20
+
### Fixed
+
- Social: Fix the path to the connections URL in the editor [#26932]
## 1.4.1 - 2022-10-19
+
### Fixed
+
- Social: Fix the connection test endpoint URL [#26892]
## 1.4.0 - 2022-10-06
+
### Added
+
- Add ContextualUpgradeTrigger to Jetpack Social admin page [#26115]
- Added check to not show the share metre if someone has a paid plan. [#26310]
- Added Jetpack social redirect urls. [#26135]
@@ -350,6 +462,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Enforce sharing limits in the Classic Editor [#26039]
### Changed
+
- Changed the values on the pricing table, and fixed a redirect [#26605]
- Move share limits code to the Publicize package [#26294]
- Set version to 1.4.0-alpha [#25955]
@@ -360,26 +473,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Use Jetpack logo in Jetpack Social pre-publish screen for Publicize and Social Preview features [#26044]
### Fixed
+
- Social: Require a user connection to use the plugin. [#26543]
- Store: Added the missing showNudge reducer [#26635]
## 1.3.0 - 2022-09-07
+
### Added
+
- Added scheduled post calculation on plugin activation. [#25334]
- Added Social Previews. [#25931]
- Added support for JITMs. [#25880]
- Enforce sharing limits in the block editor, if it is enabled for a site. [#25661]
### Changed
+
- Updated package dependencies. [#24477, #25265, #25300, #25315, #25334, #25338, #25339, #25377, #25406, #25628, #25661, #25665, #25694, #25762, #25769, #25787, #25814, #25931]
### Removed
+
- Packages: remove deprecated package. [#25883]
### Fixed
+
- Avoid PHP warnings when OG description is not set. [#25777]
### Other
+
- My Jetpack includes JITMs [#22452]
- Post release tasks. [#25364]
- Start a new release cycle. [#25289]
@@ -389,7 +509,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Enables autotag, autorelease, and autosvn actions
## 1.2.0 - 2022-08-03
+
### Added
+
- Added shares meter to Jetpack Social admin page.
- Updated package dependencies.
- Added the posts box to the Jetpack Social admin page
@@ -397,12 +519,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated publicize package version.
### Changed
+
- Rework the admin page to use new components
- Start the 1.2.0 release cycle
- Updated the tagline on the admin page.
## 1.1.0-beta - 2022-06-29
+
### Changed
+
- Renaming master to trunk.
- Renaming `master` references to `trunk`
- Reorder JS imports for `import/order` eslint rule.
@@ -410,5 +535,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Updated the design of the admin page to include share counters.
## 1.0.0 - 2022-05-31
+
### Added
+
- Initial release.
diff --git a/projects/plugins/social/changelog/add-filter-for-filtered-order-data b/projects/plugins/social/changelog/add-filter-for-filtered-order-data
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/add-filter-for-filtered-order-data
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/add-new-sync-active-modules-callable b/projects/plugins/social/changelog/add-new-sync-active-modules-callable
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/add-new-sync-active-modules-callable
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/add-protect-threat-history b/projects/plugins/social/changelog/add-protect-threat-history
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/add-protect-threat-history
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/add-social-share-status-feature-flag b/projects/plugins/social/changelog/add-social-share-status-feature-flag
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/add-social-share-status-feature-flag
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/fix-my-jetpack-currency b/projects/plugins/social/changelog/fix-my-jetpack-currency
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/fix-my-jetpack-currency
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/refactor-social-post-publish-panel b/projects/plugins/social/changelog/refactor-social-post-publish-panel
deleted file mode 100644
index c2d9eb2e4c754..0000000000000
--- a/projects/plugins/social/changelog/refactor-social-post-publish-panel
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: changed
-
-Moved PostPublishPanels component to publicize-components package
diff --git a/projects/plugins/social/changelog/remove-social-advanced-plan-nudge b/projects/plugins/social/changelog/remove-social-advanced-plan-nudge
deleted file mode 100644
index 5a418563a57a9..0000000000000
--- a/projects/plugins/social/changelog/remove-social-advanced-plan-nudge
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: removed
-
-Remove the unused Advanced plan nudge
diff --git a/projects/plugins/social/changelog/revert-svg-image-optimizations b/projects/plugins/social/changelog/revert-svg-image-optimizations
deleted file mode 100644
index 356496f8a1f8f..0000000000000
--- a/projects/plugins/social/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/social/changelog/try-no-version-bumps-in-trunk b/projects/plugins/social/changelog/try-no-version-bumps-in-trunk
deleted file mode 100644
index 91efe85c55e06..0000000000000
--- a/projects/plugins/social/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/social/changelog/update-connection-initial-state b/projects/plugins/social/changelog/update-connection-initial-state
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/update-connection-initial-state
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/changelog/update-consolidate-social-state b/projects/plugins/social/changelog/update-consolidate-social-state
deleted file mode 100644
index 688c9484e12ef..0000000000000
--- a/projects/plugins/social/changelog/update-consolidate-social-state
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: changed
-
-Social: Updated intial state logic to use the new consolidated initial state
diff --git a/projects/plugins/social/changelog/update-jsdoc-comments-for-wp-coding-standards b/projects/plugins/social/changelog/update-jsdoc-comments-for-wp-coding-standards
deleted file mode 100644
index 0e655b2b8b7a3..0000000000000
--- a/projects/plugins/social/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/social/changelog/update-my-jetpack-protect-card-waf-dependency b/projects/plugins/social/changelog/update-my-jetpack-protect-card-waf-dependency
deleted file mode 100644
index 59c80f69574e5..0000000000000
--- a/projects/plugins/social/changelog/update-my-jetpack-protect-card-waf-dependency
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Update composer lock file
diff --git a/projects/plugins/social/changelog/update-socia-render-share-status-modal-globally b/projects/plugins/social/changelog/update-socia-render-share-status-modal-globally
deleted file mode 100644
index b7d9c012f4521..0000000000000
--- a/projects/plugins/social/changelog/update-socia-render-share-status-modal-globally
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: changed
-
-Social: Updated the share status modal to render it globally
diff --git a/projects/plugins/social/changelog/update-social-initial-stat-migrate-shares-data b/projects/plugins/social/changelog/update-social-initial-stat-migrate-shares-data
deleted file mode 100644
index b1cfb12b7f277..0000000000000
--- a/projects/plugins/social/changelog/update-social-initial-stat-migrate-shares-data
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: minor
-Type: removed
-
-Social: Removed share limits UI and data logic
diff --git a/projects/plugins/social/changelog/update-social-initial-state-migrate-shares-data b/projects/plugins/social/changelog/update-social-initial-state-migrate-shares-data
deleted file mode 100644
index 40880a44a4eaa..0000000000000
--- a/projects/plugins/social/changelog/update-social-initial-state-migrate-shares-data
+++ /dev/null
@@ -1,4 +0,0 @@
-Significance: patch
-Type: changed
-
-Social: Migrated shares data to the new script data
diff --git a/projects/plugins/social/changelog/update-sync-hpos-add-shop-subscription-to-types b/projects/plugins/social/changelog/update-sync-hpos-add-shop-subscription-to-types
deleted file mode 100644
index 9aa70e3ec1f75..0000000000000
--- a/projects/plugins/social/changelog/update-sync-hpos-add-shop-subscription-to-types
+++ /dev/null
@@ -1,5 +0,0 @@
-Significance: patch
-Type: changed
-Comment: Updated composer.lock.
-
-
diff --git a/projects/plugins/social/composer.json b/projects/plugins/social/composer.json
index 9d0f2deb98628..7b3ba059a6152 100644
--- a/projects/plugins/social/composer.json
+++ b/projects/plugins/social/composer.json
@@ -84,6 +84,6 @@
"automattic/jetpack-autoloader": true,
"automattic/jetpack-composer-plugin": true
},
- "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_socialⓥ5_1_0"
+ "autoloader-suffix": "c4802e05bbcf59fd3b6350e8d3e5482c_socialⓥ5_2_0"
}
}
diff --git a/projects/plugins/social/jetpack-social.php b/projects/plugins/social/jetpack-social.php
index 22eef18bb6641..f18c302c72ce3 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.1.0
+ * Version: 5.2.0
* Author: Automattic - Jetpack Social team
* Author URI: https://jetpack.com/social/
* License: GPLv2 or later
diff --git a/projects/plugins/social/package.json b/projects/plugins/social/package.json
index 1a930f58e08b5..b3330a186a63a 100644
--- a/projects/plugins/social/package.json
+++ b/projects/plugins/social/package.json
@@ -65,7 +65,7 @@
"postcss-loader": "6.2.0",
"sass": "1.64.1",
"sass-loader": "12.4.0",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
}
}
diff --git a/projects/plugins/social/readme.txt b/projects/plugins/social/readme.txt
index 329da21e4468a..b93c5e8cb612e 100644
--- a/projects/plugins/social/readme.txt
+++ b/projects/plugins/social/readme.txt
@@ -102,12 +102,26 @@ 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.1.0 - 2024-08-08
-#### Added
-- Added feature flag management for social
+### 5.2.0 - 2024-08-29
+
+#### Changed
+
+- Admin menu: change order of Jetpack sub-menu items
+- Moved PostPublishPanels component to publicize-components package
+- Social: Migrated shares data to the new script data
+- Social: Updated intial state logic to use the new consolidated initial state
+- Social: Updated the share status modal to render it globally
+- Update composer lock file
+- Updated package dependencies.
+
+#### Removed
+
+- Remove the unused Advanced plan nudge
+- Social: Removed share limits UI and data logic
#### Fixed
-- Lossless image optimization of images in projects/plugins [subdirectories from a* through social]
+
+- Revert recent SVG image optimizations.
== Upgrade Notice ==
diff --git a/projects/plugins/social/src/class-jetpack-social.php b/projects/plugins/social/src/class-jetpack-social.php
index 60c80835cdced..9a4954d4c55eb 100644
--- a/projects/plugins/social/src/class-jetpack-social.php
+++ b/projects/plugins/social/src/class-jetpack-social.php
@@ -52,7 +52,8 @@ public function __construct( $connection_manager = null ) {
_x( 'Social', 'The Jetpack Social product name, without the Jetpack prefix', 'jetpack-social' ),
'manage_options',
'jetpack-social',
- array( $this, 'plugin_settings_page' )
+ array( $this, 'plugin_settings_page' ),
+ 4
);
add_action( 'load-' . $page_suffix, array( $this, 'admin_init' ) );
diff --git a/projects/plugins/starter-plugin/changelog/renovate-npm-webpack-vulnerability b/projects/plugins/starter-plugin/changelog/renovate-npm-webpack-vulnerability
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/plugins/starter-plugin/changelog/renovate-npm-webpack-vulnerability
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/plugins/starter-plugin/package.json b/projects/plugins/starter-plugin/package.json
index 9a3634c378eb0..070c5f753e392 100644
--- a/projects/plugins/starter-plugin/package.json
+++ b/projects/plugins/starter-plugin/package.json
@@ -50,7 +50,7 @@
"jest-environment-jsdom": "29.7.0",
"sass": "1.64.1",
"sass-loader": "12.4.0",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
}
}
diff --git a/projects/plugins/videopress/changelog/renovate-npm-webpack-vulnerability b/projects/plugins/videopress/changelog/renovate-npm-webpack-vulnerability
new file mode 100644
index 0000000000000..c47cb18e82997
--- /dev/null
+++ b/projects/plugins/videopress/changelog/renovate-npm-webpack-vulnerability
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/plugins/videopress/package.json b/projects/plugins/videopress/package.json
index b2f11b6df655f..068ef40fbbf6d 100644
--- a/projects/plugins/videopress/package.json
+++ b/projects/plugins/videopress/package.json
@@ -35,7 +35,7 @@
"concurrently": "7.6.0",
"sass": "1.64.1",
"sass-loader": "12.4.0",
- "webpack": "5.76.0",
+ "webpack": "5.94.0",
"webpack-cli": "4.9.1"
}
}
diff --git a/tools/composer-update-monorepo.sh b/tools/composer-update-monorepo.sh
index 224f198ac147d..97e25d1de5b27 100755
--- a/tools/composer-update-monorepo.sh
+++ b/tools/composer-update-monorepo.sh
@@ -25,9 +25,9 @@ function check_dir {
return 1
elif [[ -d "$1" ]]; then
DIR="${1%/}"
- elif [[ "$1" == "*/composer.json" && -f "$1" ]]; then # DWIM
+ elif [[ "$1" == */composer.json && -f "$1" ]]; then # DWIM
DIR="$(dirname "$1")"
- elif [[ "$1" == "*/composer.lock" && -f "$1" ]]; then # DWIM
+ elif [[ "$1" == */composer.lock && -f "$1" ]]; then # DWIM
DIR="$(dirname "$1")"
else
error "Directory $1 does not exist."
diff --git a/tools/version-packages.sh b/tools/version-packages.sh
index e562c8e1c5a06..c76ddec94cc93 100755
--- a/tools/version-packages.sh
+++ b/tools/version-packages.sh
@@ -35,7 +35,7 @@ function check_dir {
error "$DIR does not contain composer.json."
return 1
fi
- elif [[ "$1" == "*/composer.json" && -f "$1" ]]; then # DWIM
+ elif [[ "$1" == */composer.json && -f "$1" ]]; then # DWIM
DIR="$(dirname "$1")"
else
error "Directory $1 does not exist."
- { feature === SPELLING_MISTAKES.name && (
-
- ) }
-
- { feature !== SPELLING_MISTAKES.name &&
- ( hasSuggestions
- ? __( 'Click on the suggestion to insert it.', 'jetpack' )
- : description ) }
+ { feature !== SPELLING_MISTAKES.name &&
+ ( hasSuggestions
+ ? __( 'Click on the suggestion to insert it.', 'jetpack' )
+ : description ) }
-
-
-
+
+