Allow enableMultisite blueprint step

apps/cli/commands/site/create.ts

@@ -9,7 +9,10 @@ import {
 	DEFAULT_WORDPRESS_VERSION,
 	MINIMUM_WORDPRESS_VERSION,
 } from '@studio/common/constants';
-import { extractFormValuesFromBlueprint } from '@studio/common/lib/blueprint-settings';
+import {
+	blueprintHasMultisite,
+	extractFormValuesFromBlueprint,
+} from '@studio/common/lib/blueprint-settings';
 import {
 	filterUnsupportedBlueprintFeatures,
 	validateBlueprintData,
@@ -142,6 +145,14 @@ export async function runCommand(
 			blueprint = filterUnsupportedBlueprintFeatures(
 				options.blueprint.contents as Record< string, unknown >
 			);
+
+			if ( blueprint && blueprintHasMultisite( blueprint ) && ! options.customDomain ) {
+				throw new LoggerError(
+					__(
+						'The enableMultisite Blueprint step requires a custom domain. WordPress multisite does not support custom ports. Use --domain <name>.local to set a custom domain.'
+					)
+				);
+			}
 		}
 
 		const appdata = await readAppdata();

apps/cli/commands/site/tests/create.test.ts

@@ -563,6 +563,41 @@ describe( 'CLI: studio site create', () => {
 		} );
 	} );
 
+	describe( 'Multisite Validation', () => {
+		it( 'should error when enableMultisite step is present without custom domain', async () => {
+			const multisiteBlueprint: Blueprint = {
+				steps: [ { step: 'enableMultisite' } ],
+			};
+
+			await expect(
+				runCommand( mockSitePath, {
+					...defaultTestOptions,
+					blueprint: {
+						uri: '/home/test/blueprint.json',
+						contents: multisiteBlueprint,
+					},
+				} )
+			).rejects.toThrow( /enableMultisite.*custom domain/i );
+		} );
+
+		it( 'should proceed when enableMultisite step is present with custom domain', async () => {
+			const multisiteBlueprint: Blueprint = {
+				steps: [ { step: 'enableMultisite' } ],
+			};
+
+			await runCommand( mockSitePath, {
+				...defaultTestOptions,
+				customDomain: 'test.local',
+				blueprint: {
+					uri: '/home/test/blueprint.json',
+					contents: multisiteBlueprint,
+				},
+			} );
+
+			expect( startWordPressServer ).toHaveBeenCalled();
+		} );
+	} );
+
 	describe( 'noStart Option', () => {
 		it( 'should not start server when noStart is true', async () => {
 			await runCommand( mockSitePath, {

apps/studio/src/hooks/use-add-site.ts

@@ -74,6 +74,7 @@ export function useAddSite() {
 	const [ blueprintSuggestedSiteName, setBlueprintSuggestedSiteName ] = useState<
 		string | undefined
 	>();
+	const [ blueprintRequiresCustomDomain, setBlueprintRequiresCustomDomain ] = useState( false );
 	const [ isDeeplinkFlow, setIsDeeplinkFlow ] = useState( false );
 	const [ existingDomainNames, setExistingDomainNames ] = useState< string[] >( [] );
 
@@ -89,6 +90,7 @@ export function useAddSite() {
 		setBlueprintSuggestedDomain( undefined );
 		setBlueprintSuggestedHttps( undefined );
 		setBlueprintSuggestedSiteName( undefined );
+		setBlueprintRequiresCustomDomain( false );
 	}, [] );
 
 	// For blueprint deeplinks - we need temporary state for PHP/WP versions
@@ -105,6 +107,7 @@ export function useAddSite() {
 		setBlueprintSuggestedDomain( undefined );
 		setBlueprintSuggestedHttps( undefined );
 		setBlueprintSuggestedSiteName( undefined );
+		setBlueprintRequiresCustomDomain( false );
 		setSelectedRemoteSite( undefined );
 		setDeeplinkPhpVersion( defaultPhpVersion as AllowedPHPVersion );
 		setDeeplinkWpVersion( defaultWordPressVersion );
@@ -341,6 +344,8 @@ export function useAddSite() {
 			setBlueprintSuggestedHttps,
 			blueprintSuggestedSiteName,
 			setBlueprintSuggestedSiteName,
+			blueprintRequiresCustomDomain,
+			setBlueprintRequiresCustomDomain,
 			selectedRemoteSite,
 			setSelectedRemoteSite,
 			existingDomainNames,
@@ -368,6 +373,7 @@ export function useAddSite() {
 			blueprintSuggestedDomain,
 			blueprintSuggestedHttps,
 			blueprintSuggestedSiteName,
+			blueprintRequiresCustomDomain,
 			selectedRemoteSite,
 			existingDomainNames,
 			loadAllCustomDomains,

apps/studio/src/modules/add-site/components/create-site-form.tsx

@@ -52,6 +52,8 @@ interface CreateSiteFormProps {
 	blueprintSuggestedDomain?: string;
 	/** Blueprint suggested HTTPS setting from defineSiteUrl step */
 	blueprintSuggestedHttps?: boolean;
+	/** Whether the blueprint requires a custom domain (e.g., multisite) */
+	blueprintRequiresCustomDomain?: boolean;
 	/** Blueprint login credentials for pre-filling admin fields */
 	blueprintCredentials?: { adminUsername?: string; adminPassword?: string };
 	/** Called when form is submitted */
@@ -168,6 +170,7 @@ export const CreateSiteForm = ( {
 	blueprintPreferredVersions,
 	blueprintSuggestedDomain,
 	blueprintSuggestedHttps,
+	blueprintRequiresCustomDomain,
 	blueprintCredentials,
 	onSubmit,
 	onValidityChange,
@@ -259,6 +262,14 @@ export const CreateSiteForm = ( {
 		setAdvancedSettingsVisible( true );
 	}, [ blueprintSuggestedDomain, blueprintSuggestedHttps ] );
 
+	useEffect( () => {
+		if ( ! blueprintRequiresCustomDomain ) {
+			return;
+		}
+		setUseCustomDomain( true );
+		setAdvancedSettingsVisible( true );
+	}, [ blueprintRequiresCustomDomain ] );
+
 	useEffect( () => {
 		if ( useCustomDomain && isCertificateTrusted ) {
 			setEnableHttps( true );
@@ -649,11 +660,18 @@ export const CreateSiteForm = ( {
 										type="checkbox"
 										id="use-custom-domain"
 										checked={ useCustomDomain }
+										disabled={ blueprintRequiresCustomDomain }
 										onChange={ ( e ) => setUseCustomDomain( e.target.checked ) }
 									/>
 									<label htmlFor="use-custom-domain">{ __( 'Use custom domain' ) }</label>
 								</div>
 
+								{ blueprintRequiresCustomDomain && (
+									<Notice status="warning" isDismissible={ false } className="mt-2">
+										{ __( 'WordPress multisite requires a custom domain.' ) }
+									</Notice>
+								) }
+
 								<div className="text-a8c-gray-50 text-xs mt-2">
 									{ __( 'Your system password will be required to set up the domain.' ) }
 								</div>

apps/studio/src/modules/add-site/components/create-site.tsx

@@ -22,6 +22,7 @@ interface CreateSiteProps {
 	blueprintPreferredVersions?: BlueprintPreferredVersions;
 	blueprintSuggestedDomain?: string;
 	blueprintSuggestedHttps?: boolean;
+	blueprintRequiresCustomDomain?: boolean;
 	blueprintCredentials?: { adminUsername?: string; adminPassword?: string };
 	originalDefaultVersions?: {
 		phpVersion?: AllowedPHPVersion;
@@ -40,6 +41,7 @@ export default function CreateSite( {
 	blueprintPreferredVersions,
 	blueprintSuggestedDomain,
 	blueprintSuggestedHttps,
+	blueprintRequiresCustomDomain,
 	blueprintCredentials,
 	onSubmit,
 	onValidityChange,
@@ -61,6 +63,7 @@ export default function CreateSite( {
 				blueprintPreferredVersions={ blueprintPreferredVersions }
 				blueprintSuggestedDomain={ blueprintSuggestedDomain }
 				blueprintSuggestedHttps={ blueprintSuggestedHttps }
+				blueprintRequiresCustomDomain={ blueprintRequiresCustomDomain }
 				blueprintCredentials={ blueprintCredentials }
 				onSubmit={ onSubmit }
 				onValidityChange={ onValidityChange }

apps/studio/src/modules/add-site/hooks/tests/use-blueprint-deeplink.test.tsx

@@ -24,6 +24,7 @@ describe( 'useBlueprintDeeplink', () => {
 	const mockSetBlueprintSuggestedDomain = vi.fn();
 	const mockSetBlueprintSuggestedHttps = vi.fn();
 	const mockSetBlueprintSuggestedSiteName = vi.fn();
+	const mockSetBlueprintRequiresCustomDomain = vi.fn();
 	const mockSetIsDeeplinkFlow = vi.fn();
 	let ipcCallback: Parameters< typeof useIpcListener >[ 1 ];
 
@@ -40,6 +41,7 @@ describe( 'useBlueprintDeeplink', () => {
 					setBlueprintSuggestedDomain: mockSetBlueprintSuggestedDomain,
 					setBlueprintSuggestedHttps: mockSetBlueprintSuggestedHttps,
 					setBlueprintSuggestedSiteName: mockSetBlueprintSuggestedSiteName,
+					setBlueprintRequiresCustomDomain: mockSetBlueprintRequiresCustomDomain,
 					setIsDeeplinkFlow: mockSetIsDeeplinkFlow,
 				} ),
 			{ wrapper }
@@ -227,8 +229,8 @@ describe( 'useBlueprintDeeplink', () => {
 			} );
 		} );
 
-		expect( mockSetBlueprintSuggestedDomain ).not.toHaveBeenCalled();
-		expect( mockSetBlueprintSuggestedHttps ).not.toHaveBeenCalled();
+		expect( mockSetBlueprintSuggestedDomain ).toHaveBeenCalledWith( undefined );
+		expect( mockSetBlueprintSuggestedHttps ).toHaveBeenCalledWith( undefined );
 	} );
 
 	it( 'should set site name from setSiteOptions blogname', async () => {

apps/studio/src/modules/add-site/hooks/use-blueprint-deeplink.ts

@@ -1,16 +1,13 @@
+import { generateDefaultBlueprintDescription } from '@studio/common/lib/blueprint-settings';
 import {
-	extractFormValuesFromBlueprint,
-	generateDefaultBlueprintDescription,
-} from '@studio/common/lib/blueprint-settings';
-import {
-	BlueprintValidationWarning,
 	BlueprintPreferredVersions,
+	BlueprintValidationWarning,
 } from '@studio/common/lib/blueprint-validation';
-import { useI18n } from '@wordpress/react-i18n';
 import { useCallback } from 'react';
 import { useIpcListener } from 'src/hooks/use-ipc-listener';
 import { getIpcApi } from 'src/lib/get-ipc-api';
 import { Blueprint } from 'src/stores/wpcom-api';
+import { applyBlueprintFormValues } from '../lib/apply-blueprint-form-values';
 
 type BlueprintMetadata = {
 	title?: string;
@@ -27,12 +24,12 @@ interface UseBlueprintDeeplinkOptions {
 	setBlueprintSuggestedDomain: ( domain: string | undefined ) => void;
 	setBlueprintSuggestedHttps: ( https: boolean | undefined ) => void;
 	setBlueprintSuggestedSiteName: ( name: string | undefined ) => void;
+	setBlueprintRequiresCustomDomain: ( requires: boolean ) => void;
 	setIsDeeplinkFlow: ( isDeeplink: boolean ) => void;
 	onModalOpen?: () => void;
 }
 
 export function useBlueprintDeeplink( options: UseBlueprintDeeplinkOptions ): void {
-	const { __ } = useI18n();
 	const {
 		isAnySiteProcessing,
 		setSelectedBlueprint,
@@ -43,6 +40,7 @@ export function useBlueprintDeeplink( options: UseBlueprintDeeplinkOptions ): vo
 		setBlueprintSuggestedDomain,
 		setBlueprintSuggestedHttps,
 		setBlueprintSuggestedSiteName,
+		setBlueprintRequiresCustomDomain,
 		setIsDeeplinkFlow,
 		onModalOpen,
 	} = options;
@@ -80,26 +78,15 @@ export function useBlueprintDeeplink( options: UseBlueprintDeeplinkOptions ): vo
 
 					setSelectedBlueprint( fileBlueprint );
 
-					const formValues = extractFormValuesFromBlueprint( blueprintJson );
-
-					if ( blueprintJson.preferredVersions ) {
-						setBlueprintPreferredVersions(
-							blueprintJson.preferredVersions as BlueprintPreferredVersions
-						);
-					}
-					if ( formValues.phpVersion ) {
-						setPhpVersion( formValues.phpVersion );
-					}
-					if ( formValues.wpVersion ) {
-						setWpVersion( formValues.wpVersion );
-					}
-					if ( formValues.customDomain ) {
-						setBlueprintSuggestedDomain( formValues.customDomain );
-						setBlueprintSuggestedHttps( formValues.enableHttps );
-					}
-					if ( formValues.siteName ) {
-						setBlueprintSuggestedSiteName( formValues.siteName );
-					}
+					applyBlueprintFormValues( blueprintJson, {
+						setBlueprintPreferredVersions,
+						setPhpVersion,
+						setWpVersion,
+						setBlueprintSuggestedDomain,
+						setBlueprintSuggestedHttps,
+						setBlueprintSuggestedSiteName,
+						setBlueprintRequiresCustomDomain,
+					} );
 
 					setBlueprintWarnings( warnings );
 					setIsDeeplinkFlow( true );
@@ -118,6 +105,7 @@ export function useBlueprintDeeplink( options: UseBlueprintDeeplinkOptions ): vo
 				setBlueprintSuggestedDomain,
 				setBlueprintSuggestedHttps,
 				setBlueprintSuggestedSiteName,
+				setBlueprintRequiresCustomDomain,
 				setIsDeeplinkFlow,
 				onModalOpen,
 			]