Merge branch 'trunk' into vdimitrakis/add-price-in-posts-endpoint

.pnpmfile.cjs

@@ -11,6 +11,15 @@
  * @returns {object} Modified pkg.
  */
 function fixDeps( pkg ) {
+	// Outdated dep. Already fixed upstream, just waiting on a release.
+	// https://github.com/Automattic/wp-calypso/pull/87350
+	if (
+		pkg.name === '@automattic/social-previews' &&
+		pkg.dependencies?.[ '@wordpress/components' ] === '^25.10.0'
+	) {
+		pkg.dependencies[ '@wordpress/components' ] = '^26.0.0';
+	}
+
 	// Missing dep or peer dep on react.
 	// https://github.com/WordPress/gutenberg/issues/55171
 	if (
@@ -59,12 +68,6 @@ function fixDeps( pkg ) {
 		pkg.dependencies.cssnano = '^5.0.1 || ^6';
 	}
 
-	// Outdated dependency.
-	// No upstream bug link yet.
-	if ( pkg.name === 'svelte-navigator' && pkg.dependencies.svelte2tsx === '^0.1.151' ) {
-		pkg.dependencies.svelte2tsx = '^0.6.10';
-	}
-
 	// Missing dep or peer dep on @babel/runtime
 	// https://github.com/zillow/react-slider/issues/296
 	if (
@@ -75,6 +78,14 @@ function fixDeps( pkg ) {
 		pkg.peerDependencies[ '@babel/runtime' ] = '^7';
 	}
 
+	// Apparently this package tried to switch from a dep to a peer dep, but screwed it up.
+	// The screwed-up-ness makes pnpm 8.15.2 behave differently from earlier versions.
+	// https://github.com/ajv-validator/ajv-formats/issues/80
+	if ( pkg.name === 'ajv-formats' && pkg.dependencies?.ajv && pkg.peerDependencies?.ajv ) {
+		delete pkg.dependencies.ajv;
+		delete pkg.peerDependenciesMeta?.ajv;
+	}
+
 	return pkg;
 }
 
@@ -91,12 +102,6 @@ function fixPeerDeps( pkg ) {
 	const reactOldPkgs = new Set( [
 		// Still on 16.
 		'react-autosize-textarea', // @wordpress/block-editor <https://github.com/WordPress/gutenberg/issues/39619>
-
-		// Still on 17.
-		'reakit', // @wordpress/components <https://github.com/WordPress/gutenberg/issues/53278>
-		'reakit-system', // @wordpress/components → reakit
-		'reakit-utils', // @wordpress/components → reakit
-		'reakit-warning', // @wordpress/components → reakit
 	] );
 	if ( reactOldPkgs.has( pkg.name ) ) {
 		for ( const p of [ 'react', 'react-dom' ] ) {

projects/js-packages/ai-client/changelog/fix-tsc-moduleResolution

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Make build usable in projects using tsc with `moduleResolution` set to 'nodenext'.

projects/js-packages/ai-client/changelog/update-voice-to-content-modal

@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+AI Client: Update voice to content feature

projects/js-packages/ai-client/package.json

@@ -1,7 +1,7 @@
 {
 	"private": false,
 	"name": "@automattic/jetpack-ai-client",
-	"version": "0.6.1",
+	"version": "0.6.2-alpha",
 	"description": "A JS client for consuming Jetpack AI services",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/ai-client/#readme",
 	"bugs": {

projects/js-packages/ai-client/src/ask-question/index.ts

@@ -2,11 +2,11 @@
  * External dependencies
  */
 import debugFactory from 'debug';
-import SuggestionsEventSource from '../suggestions-event-source';
+import SuggestionsEventSource from '../suggestions-event-source/index.js';
 /*
  * Types & constants
  */
-import type { AiModelTypeProp, PromptProp } from '../types';
+import type { AiModelTypeProp, PromptProp } from '../types.js';
 
 export type AskQuestionOptionsArgProps = {
 	/*

projects/js-packages/ai-client/src/components/ai-control/index.tsx

@@ -19,12 +19,12 @@ import React from 'react';
  * Internal dependencies
  */
 import './style.scss';
-import AiStatusIndicator from '../ai-status-indicator';
-import { GuidelineMessage } from './message';
+import AiStatusIndicator from '../ai-status-indicator/index.js';
+import { GuidelineMessage } from './message.js';
 /**
  * Types
  */
-import type { RequestingStateProp } from '../../types';
+import type { RequestingStateProp } from '../../types.js';
 type AiControlProps = {
 	disabled?: boolean;
 	value: string;