Merge remote-tracking branch 'origin/trunk' into prerelease

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

CHANGELOG.md

@@ -5,37 +5,6 @@ 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.20.2-alpha] - unreleased
-
-This is an alpha version! The changes listed here are not final.
-
-### Fixed
-- Fix block icons for display on wp.org
-
-## [0.20.1] - 2023-08-28
-### Changed
-- Updated package dependencies. [#32605]
-
-## [0.20.0] - 2023-08-21
-### Added
-- Add block.json file to Contact Form block [#32583]
-- Forms block - allow transforming to a subscribe block. [#32478]
-
-### Changed
-- Forms block: rename "Newsletter Connection" to "Creative Mail" to avoid confusing with "Jetpack Newsletters" and subscription block. Call the block a "Lead Capture" block (not sign up). [#32481]
-
-## [0.19.11] - 2023-08-14
-### Changed
-- Add a unified/consistent visual aid for focused elements. [#30219]
-
-## [0.19.10] - 2023-08-09
-### Changed
-- Updated package dependencies. [#32166]
-
-## [0.19.9] - 2023-08-07
-### Added
-- Added SIG modal ui [#31665]
-
 ## [0.19.8] - 2023-07-25
 ### Changed
 - Updated package dependencies. [#32040]
@@ -323,12 +292,6 @@ This is an alpha version! The changes listed here are not final.
 - Added a new jetpack/forms package [#28409]
 - Added a public load_contact_form method for initializing the contact form module. [#28416]
 
-[0.20.2-alpha]: https://github.com/automattic/jetpack-forms/compare/v0.20.1...v0.20.2-alpha
-[0.20.1]: https://github.com/automattic/jetpack-forms/compare/v0.20.0...v0.20.1
-[0.20.0]: https://github.com/automattic/jetpack-forms/compare/v0.19.11...v0.20.0
-[0.19.11]: https://github.com/automattic/jetpack-forms/compare/v0.19.10...v0.19.11
-[0.19.10]: https://github.com/automattic/jetpack-forms/compare/v0.19.9...v0.19.10
-[0.19.9]: https://github.com/automattic/jetpack-forms/compare/v0.19.8...v0.19.9
 [0.19.8]: https://github.com/automattic/jetpack-forms/compare/v0.19.7...v0.19.8
 [0.19.7]: https://github.com/automattic/jetpack-forms/compare/v0.19.6...v0.19.7
 [0.19.6]: https://github.com/automattic/jetpack-forms/compare/v0.19.5...v0.19.6

composer.json

@@ -4,15 +4,15 @@
 	"type": "jetpack-library",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-blocks": "^1.4.23",
-		"automattic/jetpack-assets": "^1.18.9",
-		"automattic/jetpack-connection": "^1.57.1",
-		"automattic/jetpack-status": "^1.18.2-alpha"
+		"automattic/jetpack-blocks": "^1.4.22",
+		"automattic/jetpack-assets": "^1.18.7",
+		"automattic/jetpack-connection": "^1.56.0-alpha",
+		"automattic/jetpack-status": "^1.18.0"
 	},
 	"require-dev": {
-		"yoast/phpunit-polyfills": "1.1.0",
-		"automattic/jetpack-changelogger": "^3.3.8",
-		"automattic/jetpack-connection": "^1.57.1",
+		"yoast/phpunit-polyfills": "1.0.4",
+		"automattic/jetpack-changelogger": "^3.3.7",
+		"automattic/jetpack-connection": "^1.56.0-alpha",
 		"automattic/wordbless": "^0.4.1"
 	},
 	"suggest": {
@@ -52,7 +52,7 @@
 			"link-template": "https://github.com/automattic/jetpack-forms/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-trunk": "0.20.x-dev"
+			"dev-trunk": "0.19.x-dev"
 		},
 		"textdomain": "jetpack-forms",
 		"version-constants": {

dist/blocks/editor.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-polyfill', 'wp-primitives', 'wp-url'), 'version' => '6a8ad48ac537397478d8');
+<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-polyfill', 'wp-url'), 'version' => 'f6eec5bff51a3cc5a138');

dist/dashboard/jetpack-forms-dashboard.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => '59fa3c4a1be5a8d3dd97');
+<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-components', 'wp-compose', 'wp-data', 'wp-date', 'wp-element', 'wp-html-entities', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => '9c0949e9d4d4c287f5ef');

package.json

@@ -1,7 +1,7 @@
 {
 	"private": true,
 	"name": "@automattic/jetpack-forms",
-	"version": "0.20.2-alpha",
+	"version": "0.19.8",
 	"description": "Jetpack Forms",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/forms/#readme",
 	"bugs": {
@@ -29,18 +29,17 @@
 		"extends @wordpress/browserslist-config"
 	],
 	"dependencies": {
-		"@automattic/jetpack-components": "^0.42.0-alpha",
-		"@automattic/jetpack-shared-extension-utils": "^0.11.4-alpha",
-		"@wordpress/block-editor": "12.6.0",
-		"@wordpress/blocks": "12.15.0",
-		"@wordpress/compose": "6.15.0",
-		"@wordpress/data": "9.8.0",
-		"@wordpress/element": "5.15.0",
-		"@wordpress/hooks": "3.38.0",
-		"@wordpress/i18n": "4.38.0",
-		"@wordpress/icons": "9.29.0",
+		"@automattic/jetpack-components": "^0.41.0",
+		"@automattic/jetpack-shared-extension-utils": "^0.10.9",
+		"@wordpress/block-editor": "12.5.0",
+		"@wordpress/blocks": "12.14.0",
+		"@wordpress/compose": "6.14.0",
+		"@wordpress/data": "9.7.0",
+		"@wordpress/element": "5.14.0",
+		"@wordpress/hooks": "3.37.0",
+		"@wordpress/i18n": "4.37.0",
+		"@wordpress/icons": "9.28.0",
 		"classnames": "2.3.2",
-		"copy-webpack-plugin": "11.0.0",
 		"email-validator": "2.0.4",
 		"gridicons": "3.4.1",
 		"lodash": "4.17.21",
@@ -56,7 +55,7 @@
 	},
 	"devDependencies": {
 		"@automattic/color-studio": "2.5.0",
-		"@automattic/jetpack-base-styles": "^0.6.7-alpha",
+		"@automattic/jetpack-base-styles": "^0.6.4",
 		"@automattic/jetpack-webpack-config": "workspace:*",
 		"@automattic/remove-asset-webpack-plugin": "^1.0.19",
 		"@babel/core": "7.22.9",
@@ -65,11 +64,11 @@
 		"@babel/plugin-transform-runtime": "7.22.9",
 		"@babel/preset-env": "7.22.9",
 		"@babel/runtime": "7.22.6",
-		"@wordpress/api-fetch": "6.35.0",
-		"@wordpress/babel-plugin-import-jsx-pragma": "4.21.0",
-		"@wordpress/browserslist-config": "5.21.0",
-		"@wordpress/components": "25.4.0",
-		"@wordpress/date": "4.38.0",
+		"@wordpress/api-fetch": "6.34.0",
+		"@wordpress/babel-plugin-import-jsx-pragma": "4.20.0",
+		"@wordpress/browserslist-config": "5.20.0",
+		"@wordpress/components": "25.3.0",
+		"@wordpress/date": "4.37.0",
 		"autoprefixer": "10.4.14",
 		"concurrently": "7.6.0",
 		"glob": "7.1.6",

src/class-jetpack-forms.php

@@ -15,7 +15,7 @@
  */
 class Jetpack_Forms {
 
-	const PACKAGE_VERSION = '0.20.2-alpha';
+	const PACKAGE_VERSION = '0.19.8';
 
 	/**
 	 * Load the contact form module.

src/contact-form/class-util.php

@@ -47,7 +47,7 @@ public static function register_pattern() {
 
 		$patterns = array(
 			'contact-form'      => array(
-				'title'      => __( 'Contact Form', 'jetpack-forms' ),
+				'title'      => 'Contact Form',
 				'blockTypes' => array( 'jetpack/contact-form' ),
 				'categories' => array( $category_slug ),
 				'content'    => '<!-- wp:jetpack/contact-form {"style":{"spacing":{"padding":{"top":"16px","right":"16px","bottom":"16px","left":"16px"}}}} -->
@@ -60,7 +60,7 @@ public static function register_pattern() {
                     <!-- /wp:jetpack/contact-form -->',
 			),
 			'newsletter-form'   => array(
-				'title'      => __( 'Lead Capture Form', 'jetpack-forms' ),
+				'title'      => 'Newsletter Subscription Form',
 				'blockTypes' => array( 'jetpack/contact-form' ),
 				'categories' => array( $category_slug ),
 				'content'    => '<!-- wp:jetpack/contact-form {"style":{"spacing":{"padding":{"top":"16px","right":"16px","bottom":"16px","left":"16px"}}}} -->
@@ -73,7 +73,7 @@ public static function register_pattern() {
                     <!-- /wp:jetpack/contact-form -->',
 			),
 			'rsvp-form'         => array(
-				'title'      => __( 'RSVP Form', 'jetpack-forms' ),
+				'title'      => 'RSVP Form',
 				'blockTypes' => array( 'jetpack/contact-form' ),
 				'categories' => array( $category_slug ),
 				'content'    => '<!-- wp:jetpack/contact-form {"subject":"A new RSVP from your website","style":{"spacing":{"padding":{"top":"16px","right":"16px","bottom":"16px","left":"16px"}}}} -->
@@ -87,7 +87,7 @@ public static function register_pattern() {
                     <!-- /wp:jetpack/contact-form -->',
 			),
 			'registration-form' => array(
-				'title'      => __( 'Registration Form', 'jetpack-forms' ),
+				'title'      => 'Registration Form',
 				'blockTypes' => array( 'jetpack/contact-form' ),
 				'categories' => array( $category_slug ),
 				'content'    => '<!-- wp:jetpack/contact-form {"subject":"A new registration from your website","style":{"spacing":{"padding":{"top":"16px","right":"16px","bottom":"16px","left":"16px"}}}} -->
@@ -102,7 +102,7 @@ public static function register_pattern() {
                     <!-- /wp:jetpack/contact-form -->',
 			),
 			'appointment-form'  => array(
-				'title'      => __( 'Appointment Form', 'jetpack-forms' ),
+				'title'      => 'Appointment Form',
 				'blockTypes' => array( 'jetpack/contact-form' ),
 				'categories' => array( $category_slug ),
 				'content'    => '<!-- wp:jetpack/contact-form {"subject":"A new appointment booked from your website","style":{"spacing":{"padding":{"top":"16px","right":"16px","bottom":"16px","left":"16px"}}}} -->
@@ -118,7 +118,7 @@ public static function register_pattern() {
                     <!-- /wp:jetpack/contact-form -->',
 			),
 			'feedback-form'     => array(
-				'title'      => __( 'Feedback Form', 'jetpack-forms' ),
+				'title'      => 'Feedback Form',
 				'blockTypes' => array( 'jetpack/contact-form' ),
 				'categories' => array( $category_slug ),
 				'content'    => '<!-- wp:jetpack/contact-form {"subject":"New feedback received from your website","style":{"spacing":{"padding":{"top":"16px","right":"16px","bottom":"16px","left":"16px"}}}} -->