Fix blueprint local resource resolution when creating sites from the app

apps/cli/commands/site/create.ts

@@ -587,6 +587,10 @@ export const registerCommand = ( yargs: StudioArgv ) => {
 					type: 'string',
 					describe: __( 'Path or URL to Blueprint JSON file' ),
 				} )
+				.option( 'original-blueprint-path', {
+					type: 'string',
+					hidden: true,
+				} )
 				.option( 'admin-username', {
 					type: 'string',
 					describe: __( 'Admin username (defaults to "admin")' ),
@@ -767,6 +771,12 @@ export const registerCommand = ( yargs: StudioArgv ) => {
 						uri,
 						contents: readBlueprint( uri ),
 					};
+
+					// When invoked by the desktop app, the blueprint contents come from a temp file
+					// but resources should be resolved relative to the original file location.
+					if ( argv.originalBlueprintPath ) {
+						config.blueprint.uri = path.resolve( argv.originalBlueprintPath );
+					}
 				}
 			}
 

apps/studio/src/ipc-handlers.ts

@@ -439,6 +439,7 @@ export async function createSite(
 				enableHttps,
 				siteId,
 				blueprint: blueprint?.blueprint,
+				originalBlueprintPath: blueprint?.filePath,
 				adminUsername,
 				adminPassword,
 				adminEmail,

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

@@ -36,6 +36,7 @@ interface Blueprint {
 		};
 		[ key: string ]: unknown;
 	};
+	filePath?: string;
 }
 
 interface DataViewBlueprint extends Blueprint {
@@ -225,6 +226,7 @@ export function AddSiteBlueprintSelector( {
 					image: '', // No image for file-based blueprints
 					playground_url: '', // No playground URL for file-based blueprints
 					blueprint: blueprintJson, // The actual blueprint JSON
+					filePath: getIpcApi().getPathForFile( file ),
 				};
 
 				setUploadedFileName( null );

apps/studio/src/modules/cli/lib/cli-site-creator.ts

@@ -35,6 +35,7 @@ export interface CreateSiteOptions {
 	enableHttps?: boolean;
 	siteId?: string;
 	blueprint?: Blueprint;
+	originalBlueprintPath?: string;
 	adminUsername?: string;
 	adminPassword?: string;
 	adminEmail?: string;
@@ -50,6 +51,9 @@ export async function createSiteViaCli( options: CreateSiteOptions ): Promise< C
 		blueprintTempPath = path.join( os.tmpdir(), `studio-blueprint-${ Date.now() }.json` );
 		fs.writeFileSync( blueprintTempPath, JSON.stringify( options.blueprint ) );
 		args.push( '--blueprint', blueprintTempPath );
+		if ( options.originalBlueprintPath ) {
+			args.push( '--original-blueprint-path', options.originalBlueprintPath );
+		}
 	}
 
 	return new Promise( ( resolve, reject ) => {

apps/studio/src/stores/wpcom-api.ts

@@ -67,6 +67,7 @@ const blueprintSchema = z.object( {
 	image: z.string(),
 	playground_url: z.string(),
 	blueprint: z.record( z.string(), z.unknown() ),
+	filePath: z.string().optional(),
 } );
 
 export type Blueprint = z.infer< typeof blueprintSchema >;