@automattic/jetpack-ai-client 0.18.1 → 0.19.0

package/CHANGELOG.md

@@ -5,6 +5,12 @@ 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.19.0] - 2024-09-23
+### Changed
+- AI Client: Don't send a default style to jetpack-ai-image endpoint, default is handled in backend and we need to not send it until we're ready for it to be a user option. [#39494]
+- Jetpack AI: Point upgrade links and buttons to checkout instead of product interstitial. [#39469]
+- Logo generator: Get selection from the prompt's document rather than the global `window`. [#39364]
+
 ## [0.18.1] - 2024-09-10
 ### Changed
 - Updated package dependencies. [#39302]
@@ -409,6 +415,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated package dependencies. [#31659]
 - Updated package dependencies. [#31785]
 
+[0.19.0]: https://github.com/Automattic/jetpack-ai-client/compare/v0.18.1...v0.19.0
 [0.18.1]: https://github.com/Automattic/jetpack-ai-client/compare/v0.18.0...v0.18.1
 [0.18.0]: https://github.com/Automattic/jetpack-ai-client/compare/v0.17.0...v0.18.0
 [0.17.0]: https://github.com/Automattic/jetpack-ai-client/compare/v0.16.4...v0.17.0

package/build/hooks/use-image-generator/index.js

@@ -168,7 +168,6 @@ const useImageGenerator = () => {
                 prompt,
                 feature,
                 model: 'stable-diffusion',
-                style: 'photographic',
             };
             const data = await executeImageGeneration(parameters);
             return data;

package/build/logo-generator/components/prompt.js

@@ -74,7 +74,7 @@ export const Prompt = ({ initialPrompt = '' }) => {
     };
     const onPromptPaste = (event) => {
         event.preventDefault();
-        const selection = window.getSelection();
+        const selection = event.currentTarget.ownerDocument.getSelection();
         if (!selection || !selection.rangeCount) {
             return;
         }

package/build/logo-generator/hooks/use-checkout.js

@@ -17,18 +17,27 @@ export const useCheckout = () => {
             tierPlansEnabled: selectors.getAiAssistantFeature().tierPlansEnabled,
         };
     }, []);
+    const isJetpackSite = !isAtomicSite() && !isSimpleSite();
+    const redirectSource = isJetpackSite
+        ? 'jetpack-ai-upgrade-url-for-jetpack-sites'
+        : 'jetpack-ai-yearly-tier-upgrade-nudge';
     /**
-     * Use the Jetpack redirect URL to open the checkout page
+     * Determine the post-checkout URL for non-Jetpack sites
      */
-    const wpcomCheckoutUrl = new URL(`https://jetpack.com/redirect/`);
-    wpcomCheckoutUrl.searchParams.set('source', 'jetpack-ai-yearly-tier-upgrade-nudge');
-    wpcomCheckoutUrl.searchParams.set('site', getSiteFragment());
-    wpcomCheckoutUrl.searchParams.set('path', tierPlansEnabled ? `jetpack_ai_yearly:-q-${nextTier?.limit}` : 'jetpack_ai_yearly');
+    const siteFragment = getSiteFragment();
+    const wpcomRedirectToURL = `https://wordpress.com/home/${siteFragment}`;
     /**
-     * Open the product interstitial page
+     * Use the Jetpack redirect URL to open the checkout page
      */
-    const jetpackCheckoutUrl = `${window?.Jetpack_Editor_Initial_State?.adminUrl}admin.php?redirect_to_referrer=1&page=my-jetpack#/add-jetpack-ai`;
-    const nextTierCheckoutURL = isAtomicSite() || isSimpleSite() ? wpcomCheckoutUrl.toString() : jetpackCheckoutUrl;
+    const checkoutUrl = new URL(`https://jetpack.com/redirect/`);
+    checkoutUrl.searchParams.set('source', redirectSource);
+    checkoutUrl.searchParams.set('site', siteFragment);
+    checkoutUrl.searchParams.set('path', tierPlansEnabled ? `jetpack_ai_yearly:-q-${nextTier?.limit}` : 'jetpack_ai_yearly');
+    // For Jetpack sites, the redirect_to parameter is handled by the Jetpack redirect source
+    if (!isJetpackSite) {
+        checkoutUrl.searchParams.set('query', `redirect_to=${encodeURIComponent(wpcomRedirectToURL)}`);
+    }
+    const nextTierCheckoutURL = checkoutUrl.toString();
     debug('Next tier checkout URL: ', nextTierCheckoutURL);
     return {
         nextTierCheckoutURL,

package/package.json

@@ -1,7 +1,7 @@
 {
 	"private": false,
 	"name": "@automattic/jetpack-ai-client",
-	"version": "0.18.1",
+	"version": "0.19.0",
 	"description": "A JS client for consuming Jetpack AI services",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/ai-client/#readme",
 	"bugs": {
@@ -44,8 +44,8 @@
 	"types": "./build/index.d.ts",
 	"dependencies": {
 		"@automattic/jetpack-base-styles": "^0.6.32",
-		"@automattic/jetpack-connection": "^0.35.7",
-		"@automattic/jetpack-shared-extension-utils": "^0.15.9",
+		"@automattic/jetpack-connection": "^0.35.8",
+		"@automattic/jetpack-shared-extension-utils": "^0.15.10",
 		"@microsoft/fetch-event-source": "2.0.1",
 		"@types/react": "18.3.3",
 		"@types/wordpress__block-editor": "11.5.15",

package/src/hooks/use-image-generator/index.ts

@@ -214,7 +214,6 @@ const useImageGenerator = () => {
 				prompt,
 				feature,
 				model: 'stable-diffusion',
-				style: 'photographic',
 			};
 
 			const data: ImageGenerationResponse = await executeImageGeneration( parameters );

package/src/logo-generator/components/prompt.tsx

@@ -102,7 +102,7 @@ export const Prompt: React.FC< { initialPrompt?: string } > = ( { initialPrompt
 	const onPromptPaste = ( event: React.ClipboardEvent< HTMLInputElement > ) => {
 		event.preventDefault();
 
-		const selection = window.getSelection();
+		const selection = event.currentTarget.ownerDocument.getSelection();
 		if ( ! selection || ! selection.rangeCount ) {
 			return;
 		}

package/src/logo-generator/hooks/use-checkout.ts

@@ -28,25 +28,37 @@ export const useCheckout = () => {
 		};
 	}, [] );
 
+	const isJetpackSite = ! isAtomicSite() && ! isSimpleSite();
+	const redirectSource = isJetpackSite
+		? 'jetpack-ai-upgrade-url-for-jetpack-sites'
+		: 'jetpack-ai-yearly-tier-upgrade-nudge';
+
 	/**
-	 * Use the Jetpack redirect URL to open the checkout page
+	 * Determine the post-checkout URL for non-Jetpack sites
 	 */
-	const wpcomCheckoutUrl = new URL( `https://jetpack.com/redirect/` );
-	wpcomCheckoutUrl.searchParams.set( 'source', 'jetpack-ai-yearly-tier-upgrade-nudge' );
-	wpcomCheckoutUrl.searchParams.set( 'site', getSiteFragment() as string );
+	const siteFragment = getSiteFragment() as string;
+	const wpcomRedirectToURL = `https://wordpress.com/home/${ siteFragment }`;
 
-	wpcomCheckoutUrl.searchParams.set(
+	/**
+	 * Use the Jetpack redirect URL to open the checkout page
+	 */
+	const checkoutUrl = new URL( `https://jetpack.com/redirect/` );
+	checkoutUrl.searchParams.set( 'source', redirectSource );
+	checkoutUrl.searchParams.set( 'site', siteFragment );
+	checkoutUrl.searchParams.set(
 		'path',
 		tierPlansEnabled ? `jetpack_ai_yearly:-q-${ nextTier?.limit }` : 'jetpack_ai_yearly'
 	);
 
-	/**
-	 * Open the product interstitial page
-	 */
-	const jetpackCheckoutUrl = `${ window?.Jetpack_Editor_Initial_State?.adminUrl }admin.php?redirect_to_referrer=1&page=my-jetpack#/add-jetpack-ai`;
+	// For Jetpack sites, the redirect_to parameter is handled by the Jetpack redirect source
+	if ( ! isJetpackSite ) {
+		checkoutUrl.searchParams.set(
+			'query',
+			`redirect_to=${ encodeURIComponent( wpcomRedirectToURL ) }`
+		);
+	}
 
-	const nextTierCheckoutURL =
-		isAtomicSite() || isSimpleSite() ? wpcomCheckoutUrl.toString() : jetpackCheckoutUrl;
+	const nextTierCheckoutURL = checkoutUrl.toString();
 
 	debug( 'Next tier checkout URL: ', nextTierCheckoutURL );