From f616dfa8c91b48c6331663beeaf18a9435a9f271 Mon Sep 17 00:00:00 2001 From: Richard Ortiz Date: Wed, 24 Jul 2024 17:26:56 +0200 Subject: [PATCH 1/4] Added a task to the launchpad to generate content for rreadymade templates --- .../features/launchpad/launchpad-task-definitions.php | 9 +++++++++ .../src/features/launchpad/launchpad.php | 1 + 2 files changed, 10 insertions(+) diff --git a/projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad-task-definitions.php b/projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad-task-definitions.php index f8b8fb242d229..67c7c485ba3c3 100644 --- a/projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad-task-definitions.php +++ b/projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad-task-definitions.php @@ -117,6 +117,15 @@ function wpcom_launchpad_get_task_definitions() { return $base_path; }, ), + 'generate_content' => array( + 'get_title' => function () { + return __( 'Customize content with AI', 'jetpack-mu-wpcom' ); + }, + 'is_complete_callback' => 'wpcom_launchpad_is_task_option_completed', + 'get_calypso_path' => function ( $task, $default, $data ) { + return '/setup/readymade-template/generateContent?siteSlug=' . $data['site_slug_encoded']; + }, + ), 'plan_completed' => array( 'get_title' => function () { return __( 'Choose a plan', 'jetpack-mu-wpcom' ); diff --git a/projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad.php b/projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad.php index bc0223472cdb0..73f028dd9e336 100644 --- a/projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad.php +++ b/projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad.php @@ -265,6 +265,7 @@ function wpcom_launchpad_get_task_list_definitions() { 'plan_completed', 'setup_free', 'design_selected', + 'generate_content', 'domain_upsell', 'design_edited', 'site_launched', From 687fc141917c5a4bdc65c7b9df94cce52914b554 Mon Sep 17 00:00:00 2001 From: Richard Ortiz Date: Wed, 24 Jul 2024 17:27:55 +0200 Subject: [PATCH 2/4] changelog --- .../add-readymade-template-generate-content-task-definition | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 projects/packages/jetpack-mu-wpcom/changelog/add-readymade-template-generate-content-task-definition diff --git a/projects/packages/jetpack-mu-wpcom/changelog/add-readymade-template-generate-content-task-definition b/projects/packages/jetpack-mu-wpcom/changelog/add-readymade-template-generate-content-task-definition new file mode 100644 index 0000000000000..b60ec6731ac12 --- /dev/null +++ b/projects/packages/jetpack-mu-wpcom/changelog/add-readymade-template-generate-content-task-definition @@ -0,0 +1,4 @@ +Significance: minor +Type: added + +Added a new task to the readymade-template launchpad for generating content with AI From 50d75c4c4445d33c67df1192a14b6c526e19a164 Mon Sep 17 00:00:00 2001 From: Richard Ortiz Date: Fri, 26 Jul 2024 09:17:48 +0200 Subject: [PATCH 3/4] Changed steps order for a more natural flow --- .../jetpack-mu-wpcom/src/features/launchpad/launchpad.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad.php b/projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad.php index 73f028dd9e336..a23dd96c09bb7 100644 --- a/projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad.php +++ b/projects/packages/jetpack-mu-wpcom/src/features/launchpad/launchpad.php @@ -262,10 +262,10 @@ function wpcom_launchpad_get_task_list_definitions() { }, 'task_ids' => array( 'verify_domain_email', - 'plan_completed', - 'setup_free', 'design_selected', + 'setup_free', 'generate_content', + 'plan_completed', 'domain_upsell', 'design_edited', 'site_launched', From 4cc04a203b283994ad1b51ebcac94e9e7b725ea8 Mon Sep 17 00:00:00 2001 From: Richard Ortiz Date: Fri, 26 Jul 2024 09:29:06 +0200 Subject: [PATCH 4/4] Updated versions --- projects/packages/jetpack-mu-wpcom/composer.json | 2 +- projects/packages/jetpack-mu-wpcom/package.json | 2 +- .../packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php | 2 +- .../add-readymade-template-generate-content-task-definition | 5 +++++ projects/plugins/mu-wpcom-plugin/composer.json | 2 +- projects/plugins/mu-wpcom-plugin/composer.lock | 4 ++-- projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php | 2 +- projects/plugins/mu-wpcom-plugin/package.json | 2 +- .../add-readymade-template-generate-content-task-definition | 5 +++++ projects/plugins/wpcomsh/composer.json | 2 +- projects/plugins/wpcomsh/composer.lock | 4 ++-- projects/plugins/wpcomsh/package.json | 2 +- projects/plugins/wpcomsh/wpcomsh.php | 4 ++-- 13 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 projects/plugins/mu-wpcom-plugin/changelog/add-readymade-template-generate-content-task-definition create mode 100644 projects/plugins/wpcomsh/changelog/add-readymade-template-generate-content-task-definition diff --git a/projects/packages/jetpack-mu-wpcom/composer.json b/projects/packages/jetpack-mu-wpcom/composer.json index c08b3789637d1..1ec5d17436295 100644 --- a/projects/packages/jetpack-mu-wpcom/composer.json +++ b/projects/packages/jetpack-mu-wpcom/composer.json @@ -62,7 +62,7 @@ }, "autotagger": true, "branch-alias": { - "dev-trunk": "5.49.x-dev" + "dev-trunk": "5.50.x-dev" }, "textdomain": "jetpack-mu-wpcom", "version-constants": { diff --git a/projects/packages/jetpack-mu-wpcom/package.json b/projects/packages/jetpack-mu-wpcom/package.json index ebbb6dadf131d..a0690630c5537 100644 --- a/projects/packages/jetpack-mu-wpcom/package.json +++ b/projects/packages/jetpack-mu-wpcom/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-mu-wpcom", - "version": "5.49.1", + "version": "5.50.0-alpha", "description": "Enhances your site with features powered by WordPress.com", "homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/packages/jetpack-mu-wpcom/#readme", "bugs": { diff --git a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php index 0b606cc1c091c..507635effe46f 100644 --- a/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php +++ b/projects/packages/jetpack-mu-wpcom/src/class-jetpack-mu-wpcom.php @@ -13,7 +13,7 @@ * Jetpack_Mu_Wpcom main class. */ class Jetpack_Mu_Wpcom { - const PACKAGE_VERSION = '5.49.1'; + const PACKAGE_VERSION = '5.50.0-alpha'; const PKG_DIR = __DIR__ . '/../'; const BASE_DIR = __DIR__ . '/'; const BASE_FILE = __FILE__; diff --git a/projects/plugins/mu-wpcom-plugin/changelog/add-readymade-template-generate-content-task-definition b/projects/plugins/mu-wpcom-plugin/changelog/add-readymade-template-generate-content-task-definition new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/mu-wpcom-plugin/changelog/add-readymade-template-generate-content-task-definition @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/mu-wpcom-plugin/composer.json b/projects/plugins/mu-wpcom-plugin/composer.json index 5dbbc045facee..e61ee3c2ef085 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.json +++ b/projects/plugins/mu-wpcom-plugin/composer.json @@ -46,6 +46,6 @@ ] }, "config": { - "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_5_1" + "autoloader-suffix": "d9d132a783958a00a2c7cccff60ca42d_jetpack_mu_wpcom_pluginⓥ2_5_2_alpha" } } diff --git a/projects/plugins/mu-wpcom-plugin/composer.lock b/projects/plugins/mu-wpcom-plugin/composer.lock index 5d02cdd94d75f..0cb4a8fe9efe5 100644 --- a/projects/plugins/mu-wpcom-plugin/composer.lock +++ b/projects/plugins/mu-wpcom-plugin/composer.lock @@ -1005,7 +1005,7 @@ "dist": { "type": "path", "url": "../../packages/jetpack-mu-wpcom", - "reference": "ec392c1041a500bb3899148909bb2654efa86321" + "reference": "2fed571c20ac006c4bb336babe4ea20e1b9a7119" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1039,7 +1039,7 @@ }, "autotagger": true, "branch-alias": { - "dev-trunk": "5.49.x-dev" + "dev-trunk": "5.50.x-dev" }, "textdomain": "jetpack-mu-wpcom", "version-constants": { diff --git a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php index 7088691455e28..0b84c971fd851 100644 --- a/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php +++ b/projects/plugins/mu-wpcom-plugin/mu-wpcom-plugin.php @@ -3,7 +3,7 @@ * * Plugin Name: WordPress.com Features * Description: Test plugin for the jetpack-mu-wpcom package - * Version: 2.5.1 + * Version: 2.5.2-alpha * Author: Automattic * License: GPLv2 or later * Text Domain: jetpack-mu-wpcom-plugin diff --git a/projects/plugins/mu-wpcom-plugin/package.json b/projects/plugins/mu-wpcom-plugin/package.json index 1f374013d06c6..380ea8b7006be 100644 --- a/projects/plugins/mu-wpcom-plugin/package.json +++ b/projects/plugins/mu-wpcom-plugin/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@automattic/jetpack-mu-wpcom-plugin", - "version": "2.5.1", + "version": "2.5.2-alpha", "description": "Test plugin for the jetpack-mu-wpcom package", "homepage": "https://jetpack.com", "bugs": { diff --git a/projects/plugins/wpcomsh/changelog/add-readymade-template-generate-content-task-definition b/projects/plugins/wpcomsh/changelog/add-readymade-template-generate-content-task-definition new file mode 100644 index 0000000000000..9aa70e3ec1f75 --- /dev/null +++ b/projects/plugins/wpcomsh/changelog/add-readymade-template-generate-content-task-definition @@ -0,0 +1,5 @@ +Significance: patch +Type: changed +Comment: Updated composer.lock. + + diff --git a/projects/plugins/wpcomsh/composer.json b/projects/plugins/wpcomsh/composer.json index 2e8e9074e7ec2..0beead22d071c 100644 --- a/projects/plugins/wpcomsh/composer.json +++ b/projects/plugins/wpcomsh/composer.json @@ -129,7 +129,7 @@ "composer/installers": true, "roots/wordpress-core-installer": true }, - "autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_0_2" + "autoloader-suffix": "26841ac2064774301cbe06d174833bfc_wpcomshⓥ5_0_3_alpha" }, "extra": { "mirror-repo": "Automattic/wpcom-site-helper", diff --git a/projects/plugins/wpcomsh/composer.lock b/projects/plugins/wpcomsh/composer.lock index c2932a1ffe57c..4bfa7176f8498 100644 --- a/projects/plugins/wpcomsh/composer.lock +++ b/projects/plugins/wpcomsh/composer.lock @@ -1142,7 +1142,7 @@ "dist": { "type": "path", "url": "../../packages/jetpack-mu-wpcom", - "reference": "ec392c1041a500bb3899148909bb2654efa86321" + "reference": "2fed571c20ac006c4bb336babe4ea20e1b9a7119" }, "require": { "automattic/jetpack-assets": "@dev", @@ -1176,7 +1176,7 @@ }, "autotagger": true, "branch-alias": { - "dev-trunk": "5.49.x-dev" + "dev-trunk": "5.50.x-dev" }, "textdomain": "jetpack-mu-wpcom", "version-constants": { diff --git a/projects/plugins/wpcomsh/package.json b/projects/plugins/wpcomsh/package.json index 2ddc0100105f3..bd02e505893a8 100644 --- a/projects/plugins/wpcomsh/package.json +++ b/projects/plugins/wpcomsh/package.json @@ -3,7 +3,7 @@ "name": "@automattic/jetpack-wpcomsh", "description": "A helper for connecting WordPress.com sites to external host infrastructure.", "homepage": "https://jetpack.com", - "version": "5.0.2", + "version": "5.0.3-alpha", "bugs": { "url": "https://github.com/Automattic/jetpack/labels/[Plugin] Wpcomsh" }, diff --git a/projects/plugins/wpcomsh/wpcomsh.php b/projects/plugins/wpcomsh/wpcomsh.php index 134642af85f00..acffbcee1f7f0 100644 --- a/projects/plugins/wpcomsh/wpcomsh.php +++ b/projects/plugins/wpcomsh/wpcomsh.php @@ -2,14 +2,14 @@ /** * Plugin Name: WordPress.com Site Helper * Description: A helper for connecting WordPress.com sites to external host infrastructure. - * Version: 5.0.2 + * Version: 5.0.3-alpha * Author: Automattic * Author URI: http://automattic.com/ * * @package wpcomsh */ -define( 'WPCOMSH_VERSION', '5.0.2' ); +define( 'WPCOMSH_VERSION', '5.0.3-alpha' ); // If true, Typekit fonts will be available in addition to Google fonts add_filter( 'jetpack_fonts_enable_typekit', '__return_true' );