Playground CLI: Wire up execution modes for Blueprints v2

packages/playground/cli/src/mounts.ts

@@ -141,10 +141,17 @@ export function expandAutoMounts(args: RunCLIArgs): RunCLIArgs {
 			hostPath: path,
 			vfsPath: `/wordpress/wp-content/themes/${themeName}`,
 		});
-		newArgs['additional-blueprint-steps'].push({
-			step: 'activateTheme',
-			themeFolderName: themeName,
-		});
+		newArgs['additional-blueprint-steps'].push(
+			args['experimental-blueprints-v2-runner']
+				? {
+						step: 'activateTheme',
+						themeDirectoryName: themeName,
+				  }
+				: {
+						step: 'activateTheme',
+						themeFolderName: themeName,
+				  }
+		);
 	} else if (containsWpContentDirectories(path)) {
 		/**
 		 * Mount each wp-content file and directory individually.
@@ -167,17 +174,17 @@ export function expandAutoMounts(args: RunCLIArgs): RunCLIArgs {
 		newArgs['additional-blueprint-steps'].push(ACTIVATE_FIRST_THEME_STEP);
 	} else if (containsFullWordPressInstallation(path)) {
 		mountBeforeInstall.push({ hostPath: path, vfsPath: '/wordpress' });
-		// @TODO: Uncomment when merging Blueprints v2 support
-		// newArgs.mode = 'apply-to-existing-site';
+		// @TODO: If overriding another mode, throw an error or print a warning.
+		newArgs.mode = 'apply-to-existing-site';
 		newArgs['additional-blueprint-steps'].push(ACTIVATE_FIRST_THEME_STEP);
 	} else {
 		/**
 		 * By default, mount the current working directory as the Playground root.
 		 * This allows users to run and PHP or HTML files using the Playground CLI.
 		 */
 		mount.push({ hostPath: path, vfsPath: '/wordpress' });
-		// @TODO: Uncomment when merging Blueprints v2 support
-		// newArgs.mode = 'mount-only';
+		// @TODO: If overriding another mode, throw an error or print a warning.
+		newArgs.mode = 'mount-only';
 	}
 
 	return newArgs as RunCLIArgs;

packages/playground/cli/src/run-cli.ts

@@ -207,11 +207,10 @@ export async function parseOptionsAndRunCLI() {
 				type: 'boolean',
 				default: false,
 			})
-			// TODO: Should we make this a hidden flag?
 			.option('experimental-multi-worker', {
 				describe:
-					'Enable experimental multi-worker support which requires JSPI ' +
-					'and a /wordpress directory backed by a real filesystem. ' +
+					'Enable experimental multi-worker support which requires ' +
+					'a /wordpress directory backed by a real filesystem. ' +
 					'Pass a positive number to specify the number of workers to use. ' +
 					'Otherwise, default to the number of CPUs minus 1.',
 				type: 'number',
@@ -224,6 +223,14 @@ export async function parseOptionsAndRunCLI() {
 				// Remove the "hidden" flag once Blueprint V2 is fully supported
 				hidden: true,
 			})
+			.option('mode', {
+				describe:
+					'Blueprints v2 runner mode to use. This option is required when using the --experimental-blueprints-v2-runner flag with a blueprint.',
+				type: 'string',
+				choices: ['create-new-site', 'apply-to-existing-site'],
+				// Remove the "hidden" flag once Blueprint V2 is fully supported
+				hidden: true,
+			})
 			.showHelpOnFail(false)
 			.strictOptions()
 			.check(async (args) => {
@@ -275,6 +282,53 @@ export async function parseOptionsAndRunCLI() {
 						);
 					}
 				}
+
+				if (args['experimental-blueprints-v2-runner'] === true) {
+					if (args['mode'] !== undefined) {
+						if ('skip-wordpress-setup' in args) {
+							throw new Error(
+								'The --skipWordPressSetup option cannot be used with the --mode option. Use one or the other.'
+							);
+						}
+						if ('skip-sqlite-setup' in args) {
+							throw new Error(
+								'The --skipSqliteSetup option is not supported in Blueprint V2 mode.'
+							);
+						}
+						if (args['auto-mount'] !== undefined) {
+							throw new Error(
+								'The --mode option cannot be used with --auto-mount because --auto-mount automatically sets the mode.'
+							);
+						}
+					} else {
+						// Support the legacy v1 runner options
+						if (args['skip-wordpress-setup'] === true) {
+							args['mode'] = 'apply-to-existing-site';
+						} else {
+							args['mode'] = 'create-new-site';
+						}
+					}
+
+					// Support the legacy v1 runner options
+					const allow = (args['allow'] as string[]) || [];
+
+					if (args['followSymlinks'] === true) {
+						allow.push('follow-symlinks');
+					}
+
+					if (args['blueprint-may-read-adjacent-files'] === true) {
+						allow.push('read-local-fs');
+					}
+
+					args['allow'] = allow;
+				} else {
+					if (args['mode'] !== undefined) {
+						throw new Error(
+							'The --mode option requires the --experimentalBlueprintsV2Runner flag.'
+						);
+					}
+				}
+
 				return true;
 			});
 
@@ -350,8 +404,10 @@ export interface RunCLIArgs {
 	followSymlinks?: boolean;
 	'blueprint-may-read-adjacent-files'?: boolean;
 
-	// --------- Blueprint V2 args (not available via CLI yet) -----------
+	// --------- Blueprint V2 args -----------
 	mode?: 'mount-only' | 'create-new-site' | 'apply-to-existing-site';
+
+	// --------- Blueprint V2 args (not available via CLI yet) -----------
 	'db-engine'?: 'sqlite' | 'mysql';
 	'db-host'?: string;
 	'db-user'?: string;