From 6b215166a960ec8912f142cf8a1f5c7b33cc6d54 Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Tue, 13 Feb 2024 14:00:17 +0100
Subject: [PATCH 01/30] Basic error logging

---
 .../php-wasm/universal/src/lib/base-php.ts    |  36 ++++--
 packages/php-wasm/universal/src/lib/logger.ts | 121 ++++++++++++++++++
 .../lib/playground-mu-plugin/0-playground.php |  72 +++++++++--
 3 files changed, 204 insertions(+), 25 deletions(-)
 create mode 100644 packages/php-wasm/universal/src/lib/logger.ts

diff --git a/packages/php-wasm/universal/src/lib/base-php.ts b/packages/php-wasm/universal/src/lib/base-php.ts
index c45b910800..f76c1ab925 100644
--- a/packages/php-wasm/universal/src/lib/base-php.ts
+++ b/packages/php-wasm/universal/src/lib/base-php.ts
@@ -28,6 +28,7 @@ import {
 	UnhandledRejectionsTarget,
 } from './wasm-error-reporting';
 import { Semaphore, createSpawnHandler, joinPaths } from '@php-wasm/util';
+import { LogSeverity, get_logger } from './logger';
 
 const STRING = 'string';
 const NUMBER = 'number';
@@ -264,21 +265,28 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 				this.#setPHPCode(' ?>' + request.code);
 			}
 			this.#addServerGlobalEntriesInWasm();
-			const response = await this.#handleRequest();
-			if (request.throwOnError && response.exitCode !== 0) {
-				const output = {
-					stdout: response.text,
-					stderr: response.errors,
-				};
-				console.warn(`PHP.run() output was:`, output);
-				const error = new Error(
-					`PHP.run() failed with exit code ${response.exitCode} and the following output`
+			try {
+				const response = await this.#handleRequest();
+				if (request.throwOnError && response.exitCode !== 0) {
+					const output = {
+						stdout: response.text,
+						stderr: response.errors,
+					};
+					console.warn(`PHP.run() output was:`, output);
+					const error = new Error(
+						`PHP.run() failed with exit code ${response.exitCode} and the following output`
+					);
+					// @ts-ignore
+					error.output = output;
+					throw error;
+				}
+				return response;
+			} catch (e: any) {
+				get_logger(this).log(
+					e.message,
+					LogSeverity.Error,
 				);
-				// @ts-ignore
-				error.output = output;
-				throw error;
 			}
-			return response;
 		} finally {
 			try {
 				if (heapBodyPointer) {
@@ -770,6 +778,7 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 		// runtime.
 		const oldFS = this[__private__dont__use].FS;
 
+		console.log('PHP runtime exited');
 		// Kill the current runtime
 		try {
 			this.exit();
@@ -799,6 +808,7 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 	}
 
 	exit(code = 0) {
+		console.log('PHP exit()');
 		this.dispatchEvent({
 			type: 'runtime.beforedestroy',
 		});
diff --git a/packages/php-wasm/universal/src/lib/logger.ts b/packages/php-wasm/universal/src/lib/logger.ts
new file mode 100644
index 0000000000..eb3cdbef57
--- /dev/null
+++ b/packages/php-wasm/universal/src/lib/logger.ts
@@ -0,0 +1,121 @@
+import { UniversalPHP } from "./universal-php";
+
+export enum LogSeverity {
+    // A dine grained debugging event. Typically disabled in default configurations.
+    Trace = 1,
+    // A debugging event.
+    Debug = 5,
+    // An informational event. Indicates that an event happened.
+    Info = 9,
+    // A warning event. Not an error but is likely more important than an informational event.
+    Warn = 13,
+    // An error event. Something went wrong.
+    Error = 17,
+    // A fatal error such as application or system crash.
+    Fatal = 21,
+}
+
+export type Log = {
+    // Time when the event occurred.
+    timestamp: number;
+    // Time when the event was observed.
+    observedTimestamp: number;
+    // Request trace id.
+    traceId: number;
+    // Request span id.
+    spanId: number; // Not implemented
+    // W3C trace flag.
+    traceFlags: number;
+    // The severity text (also known as log level).
+    severityText: string;
+    // Numerical value of the severity.
+    severityNumber: LogSeverity;
+    // The body of the log record.
+    body: string;
+    // Describes the source of the log.
+    resource: string;
+    // Describes the scope that emitted the log.
+    instrumentationScope: string; // Not implemented
+    // Additional information about the event.
+    attributes: Record<string, string>;
+};
+
+export class Logger {
+    private php: UniversalPHP | undefined;
+    private logs: Log[] = [];
+    private wordpressLogs: string[] | undefined = undefined;
+
+    constructor(php?: UniversalPHP) {
+        this.php = php;
+        if (this.php) {
+            this.php.addEventListener(
+                'request.end',
+                () => {
+                    console.log(this.getLogs());
+                }
+            )
+            this.php.onMessage((message) => {
+                try {
+                    const logMessage = JSON.parse(message);
+                    if (logMessage.type === 'wordpress-log') {
+                        this.log(
+                            logMessage.body,
+                            logMessage.severityNumber,
+                            logMessage.timestamp,
+                            'wordpress',
+                        );
+                    }
+                } catch (error) {
+                    // Not a log message
+                }
+            });
+        }
+        if ( typeof window !== 'undefined' ) {
+            window.onerror = (message, source, lineno, colno) => {
+                this.log(
+                    `${message} in ${source} on line ${lineno}:${colno}`,
+                    LogSeverity.Fatal,
+                    Date.now(),
+                    'javascript',
+                );
+            }
+        }
+    }
+
+    public log(body: string, severityNumber: LogSeverity = LogSeverity.Info, timestamp?: number, resource = 'php', instrumentationScope = 'php', attributes: Record<string, string> = {}): void {
+        const now = Date.now();
+        this.logs.push({
+            timestamp: timestamp || now,
+            observedTimestamp: now,
+            traceId: 1, // @TODO: Implement trace id
+            spanId: 1, // @TODO: Implement span id
+            traceFlags: 1,
+            severityText: LogSeverity[severityNumber],
+            severityNumber,
+            body,
+            resource,
+            instrumentationScope,
+            attributes,
+        });
+    }
+
+    public getLogs(): Log[] {
+        return this.logs;
+    }
+
+    public async addWordPressLogs() {
+        if (this.php && this.wordpressLogs === undefined) {
+            const rawLogs =  await this.php.readFileAsText('/tmp/debug.log');
+        }
+    }
+
+};
+
+let logger: Logger | undefined = undefined;
+
+export function get_logger(php?: BasePHP): Logger {
+    if (!logger) {
+        logger = new Logger(php);
+    }
+    return logger;
+}
\ No newline at end of file
diff --git a/packages/playground/remote/src/lib/playground-mu-plugin/0-playground.php b/packages/playground/remote/src/lib/playground-mu-plugin/0-playground.php
index 8a8619dec3..9ca70bfbd6 100644
--- a/packages/playground/remote/src/lib/playground-mu-plugin/0-playground.php
+++ b/packages/playground/remote/src/lib/playground-mu-plugin/0-playground.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This is a temporary workaround to hide the 32bit integer warnings that 
+ * This is a temporary workaround to hide the 32bit integer warnings that
  * appear when using various time related function, such as strtotime and mktime.
  * Examples of the warnings that are displayed:
  * Warning: mktime(): Epoch doesn't fit in a PHP integer in <file>
@@ -29,19 +29,19 @@ function () {
 );
 
 /**
- * Because the in-browser Playground doesn't have access to the internet, 
- * network-dependent features like directories don't work. Normally, you'll 
+ * Because the in-browser Playground doesn't have access to the internet,
+ * network-dependent features like directories don't work. Normally, you'll
  * see a confusing message like "An unexpected error occurred." This mu-plugin
  * makes it more clear that the feature is not yet supported.
- * 
+ *
  * https://github.com/WordPress/wordpress-playground/issues/498
- * 
+ *
  * Added styling to hide the Popular tags section of the Plugins page
  * and the nonfunctional Try Again button (both Plugins and Themes) that's
  * appended when the message is displayed.
- * 
+ *
  * https://github.com/WordPress/wordpress-playground/issues/927
- * 
+ *
  */
 add_action('admin_head', function () {
   echo '<style>
@@ -90,7 +90,7 @@ function networking_disabled() {
  * the sandbox attribute. What they really should be targeting is the
  * playground iframe itself (name="playground"). This mu-plugin rewrites
  * all target="_top" links to target="playground" instead.
- * 
+ *
  * https://github.com/WordPress/wordpress-playground/issues/266
  */
 add_action('admin_print_scripts', function () {
@@ -129,9 +129,9 @@ function networking_disabled() {
  * The default WordPress requests transports have been disabled
  * at this point. However, the Requests class requires at least
  * one working transport or else it throws warnings and acts up.
- * 
+ *
  * This mu-plugin provides that transport. It's one of the two:
- * 
+ *
  * * WP_Http_Fetch – Sends requests using browser's fetch() function.
  *                   Only enabled when PHP was compiled with the VRZNO
  * 					 extension.
@@ -154,10 +154,10 @@ function networking_disabled() {
 	/**
 	 * Disable signature verification as it doesn't seem to work with
 	 * fetch requests:
-	 * 
+	 *
 	 * https://downloads.wordpress.org/plugin/classic-editor.zip returns no signature header.
 	 * https://downloads.wordpress.org/plugin/classic-editor.zip.sig returns 404.
-	 * 
+	 *
 	 * @TODO Investigate why.
 	 */
 	add_filter('wp_signature_hosts', function ($hosts) {
@@ -176,3 +176,51 @@ function networking_disabled() {
 		return $transports;
 	});
 }
+
+// Configure error logging
+$log_file = WP_CONTENT_DIR . '/debug.log';
+error_reporting(E_ALL);
+define('ERROR_LOG_FILE', $log_file);
+ini_set('error_log', $log_file);
+
+/**
+ * Get OpenTracing severity number from PHP error code
+ *
+ * @param int $code PHP error code
+ * @return int OpenTracing severity number
+ */
+function get_severity_number($code)
+{
+	// @TODO Update numbers
+	switch ($code) {
+		case E_ERROR:
+		case E_CORE_ERROR:
+		case E_COMPILE_ERROR:
+		case E_USER_ERROR:
+			return 17;
+		case E_WARNING:
+		case E_CORE_WARNING:
+		case E_COMPILE_WARNING:
+		case E_USER_WARNING:
+			return 13;
+		case E_NOTICE:
+		case E_USER_NOTICE:
+			return 9;
+		default:
+			return 5;
+	}
+}
+
+function playground_error_handler($errno, $errstr, $errfile, $errline)
+{
+	post_message_to_js(
+		json_encode([
+			'event' => 'wordpress-log',
+			'timestamp' => time(),
+			'severityNumber' => get_severity_number($errno),
+			'body' => "$errstr in $errfile on line $errline",
+		])
+	);
+	return true;
+}
+set_error_handler('playground_error_handler');

From d804cecf09298f2400525621d6aad9d563318481 Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Wed, 14 Feb 2024 10:49:46 +0100
Subject: [PATCH 02/30] Move logger to a new file

---
 .../lib/playground-mu-plugin/0-playground.php | 52 +-------------
 .../playground-includes/playground_logger.php | 70 +++++++++++++++++++
 .../remote/src/lib/worker-thread.ts           |  3 +
 3 files changed, 76 insertions(+), 49 deletions(-)
 create mode 100644 packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php

diff --git a/packages/playground/remote/src/lib/playground-mu-plugin/0-playground.php b/packages/playground/remote/src/lib/playground-mu-plugin/0-playground.php
index 9ca70bfbd6..16c19afa91 100644
--- a/packages/playground/remote/src/lib/playground-mu-plugin/0-playground.php
+++ b/packages/playground/remote/src/lib/playground-mu-plugin/0-playground.php
@@ -1,5 +1,7 @@
 <?php
 
+require(__DIR__ . '/playground-includes/playground_logger.php');
+
 /**
  * This is a temporary workaround to hide the 32bit integer warnings that
  * appear when using various time related function, such as strtotime and mktime.
@@ -175,52 +177,4 @@ function networking_disabled() {
 		$transports[] = 'Dummy';
 		return $transports;
 	});
-}
-
-// Configure error logging
-$log_file = WP_CONTENT_DIR . '/debug.log';
-error_reporting(E_ALL);
-define('ERROR_LOG_FILE', $log_file);
-ini_set('error_log', $log_file);
-
-/**
- * Get OpenTracing severity number from PHP error code
- *
- * @param int $code PHP error code
- * @return int OpenTracing severity number
- */
-function get_severity_number($code)
-{
-	// @TODO Update numbers
-	switch ($code) {
-		case E_ERROR:
-		case E_CORE_ERROR:
-		case E_COMPILE_ERROR:
-		case E_USER_ERROR:
-			return 17;
-		case E_WARNING:
-		case E_CORE_WARNING:
-		case E_COMPILE_WARNING:
-		case E_USER_WARNING:
-			return 13;
-		case E_NOTICE:
-		case E_USER_NOTICE:
-			return 9;
-		default:
-			return 5;
-	}
-}
-
-function playground_error_handler($errno, $errstr, $errfile, $errline)
-{
-	post_message_to_js(
-		json_encode([
-			'event' => 'wordpress-log',
-			'timestamp' => time(),
-			'severityNumber' => get_severity_number($errno),
-			'body' => "$errstr in $errfile on line $errline",
-		])
-	);
-	return true;
-}
-set_error_handler('playground_error_handler');
+}
\ No newline at end of file
diff --git a/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php b/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php
new file mode 100644
index 0000000000..84edd555d8
--- /dev/null
+++ b/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php
@@ -0,0 +1,70 @@
+<?php
+
+// Configure error logging
+// $log_file = WP_CONTENT_DIR . '/debug.log';
+$log_file = '/tmp/debug.log';
+error_reporting(E_ALL);
+define('ERROR_LOG_FILE', $log_file);
+ini_set('error_log', $log_file);
+ini_set("display_errors", "off");
+
+/**
+ * Get OpenTracing severity number from PHP error code
+ *
+ * @param int $code PHP error code
+ * @return int OpenTracing severity number
+ */
+function get_severity_number($code)
+{
+    // @TODO Update numbers
+    switch ($code) {
+        case E_ERROR:
+        case E_CORE_ERROR:
+        case E_COMPILE_ERROR:
+        case E_USER_ERROR:
+            return 17;
+        case E_WARNING:
+        case E_CORE_WARNING:
+        case E_COMPILE_WARNING:
+        case E_USER_WARNING:
+            return 13;
+        case E_NOTICE:
+        case E_USER_NOTICE:
+            return 9;
+        default:
+            return 5;
+    }
+}
+
+/**
+ * Send log message to JS
+ */
+function playground_error_handler($errno, $errstr, $errfile, $errline)
+{
+    post_message_to_js(
+        json_encode([
+            'event' => 'wordpress-log',
+            'timestamp' => time(),
+            'severityNumber' => get_severity_number($errno),
+            'body' => "$errstr in $errfile on line $errline",
+        ])
+    );
+    return false;
+}
+
+set_error_handler('playground_error_handler', E_ALL);
+
+/**
+ * Collect last error on shutdown
+ */
+function collect_last_error_on_shutdown()
+{
+    $error = error_get_last();
+    if ($error !== null) {
+        playground_error_handler($error['type'], $error['message'], $error['file'], $error['line']);
+    }
+}
+
+register_shutdown_function('collect_last_error_on_shutdown');
+
+error_log('playground-mu-plugin loaded');
diff --git a/packages/playground/remote/src/lib/worker-thread.ts b/packages/playground/remote/src/lib/worker-thread.ts
index 8c3cd76c73..0401c73b80 100644
--- a/packages/playground/remote/src/lib/worker-thread.ts
+++ b/packages/playground/remote/src/lib/worker-thread.ts
@@ -37,6 +37,8 @@ import transportFetch from './playground-mu-plugin/playground-includes/wp_http_f
 /** @ts-ignore */
 import transportDummy from './playground-mu-plugin/playground-includes/wp_http_dummy.php?raw';
 /** @ts-ignore */
+import playgroundLogger from './playground-mu-plugin/playground-includes/playground_logger.php?raw';
+/** @ts-ignore */
 import playgroundMuPlugin from './playground-mu-plugin/0-playground.php?raw';
 import { joinPaths, randomString } from '@php-wasm/util';
 
@@ -275,6 +277,7 @@ try {
 		'0-playground.php': playgroundMuPlugin,
 		'playground-includes/wp_http_dummy.php': transportDummy,
 		'playground-includes/wp_http_fetch.php': transportFetch,
+		'playground-includes/playground_logger.php': playgroundLogger,
 	});
 
 	if (virtualOpfsDir) {

From 8480857bcda80572764a184f8d62ea682d324b5d Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Wed, 14 Feb 2024 12:13:20 +0100
Subject: [PATCH 03/30] Update log message param

---
 .../php-wasm/universal/src/lib/base-php.ts    |   9 +-
 packages/php-wasm/universal/src/lib/logger.ts | 122 ++++++++++--------
 .../playground-includes/playground_logger.php |  23 ++--
 3 files changed, 85 insertions(+), 69 deletions(-)

diff --git a/packages/php-wasm/universal/src/lib/base-php.ts b/packages/php-wasm/universal/src/lib/base-php.ts
index f76c1ab925..101c348ed4 100644
--- a/packages/php-wasm/universal/src/lib/base-php.ts
+++ b/packages/php-wasm/universal/src/lib/base-php.ts
@@ -282,10 +282,11 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 				}
 				return response;
 			} catch (e: any) {
-				get_logger(this).log(
-					e.message,
-					LogSeverity.Error,
-				);
+				get_logger(this).log({
+					body: e.message,
+					severityNumber: LogSeverity.Error,
+					resource: 'php',
+				});
 			}
 		} finally {
 			try {
diff --git a/packages/php-wasm/universal/src/lib/logger.ts b/packages/php-wasm/universal/src/lib/logger.ts
index eb3cdbef57..1c9ba03ba5 100644
--- a/packages/php-wasm/universal/src/lib/logger.ts
+++ b/packages/php-wasm/universal/src/lib/logger.ts
@@ -1,3 +1,4 @@
+import { BasePHP } from "./base-php";
 import { UniversalPHP } from "./universal-php";
 
 export enum LogSeverity {
@@ -15,97 +16,116 @@ export enum LogSeverity {
     Fatal = 21,
 }
 
+// Log format based on OpenTelemetry https://opentelemetry.io/docs/specs/otel/logs/data-model/
 export type Log = {
     // Time when the event occurred.
-    timestamp: number;
+    timestamp?: number;
     // Time when the event was observed.
-    observedTimestamp: number;
+    observedTimestamp?: number;
     // Request trace id.
-    traceId: number;
+    traceId?: number;
     // Request span id.
-    spanId: number; // Not implemented
+    spanId?: number; // Not implemented
     // W3C trace flag.
-    traceFlags: number;
+    traceFlags?: number;
     // The severity text (also known as log level).
-    severityText: string;
+    severityText?: string;
     // Numerical value of the severity.
     severityNumber: LogSeverity;
     // The body of the log record.
     body: string;
     // Describes the source of the log.
-    resource: string;
+    resource?: string;
     // Describes the scope that emitted the log.
-    instrumentationScope: string; // Not implemented
+    instrumentationScope?: string; // Not implemented
     // Additional information about the event.
-    attributes: Record<string, string>;
+    attributes?: Record<string, string>;
+};
+
+const defaultLog: Log = {
+    timestamp: 0,
+    observedTimestamp: 0,
+    traceId: 0,
+    spanId: 0,
+    traceFlags: 0,
+    severityText: LogSeverity[LogSeverity.Info],
+    severityNumber: LogSeverity.Info,
+    body: '',
+    resource: '',
+    instrumentationScope: '',
+    attributes: {},
 };
 
 export class Logger {
     private php: UniversalPHP | undefined;
     private logs: Log[] = [];
-    private wordpressLogs: string[] | undefined = undefined;
 
     constructor(php?: UniversalPHP) {
         this.php = php;
         if (this.php) {
+            console.log('Logger: PHP is available');
             this.php.addEventListener(
                 'request.end',
                 () => {
-                    console.log(this.getLogs());
+                    this.printWordPressLogs();
                 }
             )
-            this.php.onMessage((message) => {
-                try {
-                    const logMessage = JSON.parse(message);
-                    if (logMessage.type === 'wordpress-log') {
-                        this.log(
-                            logMessage.body,
-                            logMessage.severityNumber,
-                            logMessage.timestamp,
-                            'wordpress',
-                        );
-                    }
-                } catch (error) {
-                    // Not a log message
-                }
-            });
+            this.php.onMessage(this.processPhpLogMessage.bind(this));
         }
         if ( typeof window !== 'undefined' ) {
             window.onerror = (message, source, lineno, colno) => {
-                this.log(
-                    `${message} in ${source} on line ${lineno}:${colno}`,
-                    LogSeverity.Fatal,
-                    Date.now(),
-                    'javascript',
-                );
+                this.log({
+                    body: `${message} in ${source} on line ${lineno}:${colno}`,
+                    severityNumber: LogSeverity.Fatal,
+                    resource: 'javascript',
+                });
             }
         }
     }
 
-    public log(body: string, severityNumber: LogSeverity = LogSeverity.Info, timestamp?: number, resource = 'php', instrumentationScope = 'php', attributes: Record<string, string> = {}): void {
+    private processPhpLogMessage(message: string) {
+        try {
+            const logMessage = JSON.parse(message);
+            if (logMessage.type === 'wordpress-log') {
+                this.log({
+                   ...logMessage,
+                   severityNumber: LogSeverity[logMessage.severityText as keyof typeof LogSeverity],
+                    resource: 'wordpress',
+                });
+            }
+        } catch (error) {
+            // Not a log message
+        }
+    }
+
+    public log(rawLog: Log): void {
         const now = Date.now();
-        this.logs.push({
-            timestamp: timestamp || now,
-            observedTimestamp: now,
-            traceId: 1, // @TODO: Implement trace id
-            spanId: 1, // @TODO: Implement span id
-            traceFlags: 1,
-            severityText: LogSeverity[severityNumber],
-            severityNumber,
-            body,
-            resource,
-            instrumentationScope,
-            attributes,
-        });
+        const log = {
+            ...defaultLog,
+            ...rawLog,
+        };
+        log.timestamp = log.timestamp || now;
+        log.observedTimestamp = now;
+        log.severityText = LogSeverity[log.severityNumber];
+
+        this.logs.push(log);
+        console.log(log);
     }
 
     public getLogs(): Log[] {
         return this.logs;
     }
 
-    public async addWordPressLogs() {
-        if (this.php && this.wordpressLogs === undefined) {
-            const rawLogs =  await this.php.readFileAsText('/tmp/debug.log');
+    public async printWordPressLogs() {
+        if (!this.php) {
+            return;
+        }
+        const logPath = `/tmp/debug.log`;
+        if (await this.php.fileExists(logPath)) {
+            const rawLogs =  await this.php.readFileAsText(logPath);
+            console.log(rawLogs);
+        } else {
+            console.log('No logs found');
         }
     }
 
@@ -113,9 +133,9 @@ export class Logger {
 
 let logger: Logger | undefined = undefined;
 
-export function get_logger(php?: BasePHP): Logger {
+export function get_logger(php?: UniversalPHP | BasePHP): Logger {
     if (!logger) {
-        logger = new Logger(php);
+        logger = new Logger(php as UniversalPHP);
     }
     return logger;
 }
\ No newline at end of file
diff --git a/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php b/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php
index 84edd555d8..ab5cfbe904 100644
--- a/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php
+++ b/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php
@@ -1,38 +1,35 @@
 <?php
-
 // Configure error logging
-// $log_file = WP_CONTENT_DIR . '/debug.log';
+// @TODO use the WordPress directory
 $log_file = '/tmp/debug.log';
 error_reporting(E_ALL);
 define('ERROR_LOG_FILE', $log_file);
 ini_set('error_log', $log_file);
-ini_set("display_errors", "off");
 
 /**
- * Get OpenTracing severity number from PHP error code
+ * Get OpenTracing severity text from PHP error code
  *
  * @param int $code PHP error code
- * @return int OpenTracing severity number
+ * @return int OpenTracing severity text
  */
-function get_severity_number($code)
+function get_severity_text($code)
 {
-    // @TODO Update numbers
     switch ($code) {
         case E_ERROR:
         case E_CORE_ERROR:
         case E_COMPILE_ERROR:
         case E_USER_ERROR:
-            return 17;
+            return 'Error';
         case E_WARNING:
         case E_CORE_WARNING:
         case E_COMPILE_WARNING:
         case E_USER_WARNING:
-            return 13;
+            return 'Warning';
         case E_NOTICE:
         case E_USER_NOTICE:
-            return 9;
+            return 'Info';
         default:
-            return 5;
+            return 'Debug';
     }
 }
 
@@ -45,7 +42,7 @@ function playground_error_handler($errno, $errstr, $errfile, $errline)
         json_encode([
             'event' => 'wordpress-log',
             'timestamp' => time(),
-            'severityNumber' => get_severity_number($errno),
+            'severityText' => get_severity_text($errno),
             'body' => "$errstr in $errfile on line $errline",
         ])
     );
@@ -66,5 +63,3 @@ function collect_last_error_on_shutdown()
 }
 
 register_shutdown_function('collect_last_error_on_shutdown');
-
-error_log('playground-mu-plugin loaded');

From 7f2c27a3c1bdbb3a9ba12a5eb204d49e1b75602a Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Wed, 14 Feb 2024 12:36:11 +0100
Subject: [PATCH 04/30] Cleanup

---
 packages/php-wasm/universal/src/lib/base-php.ts | 4 +++-
 packages/php-wasm/universal/src/lib/logger.ts   | 4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/php-wasm/universal/src/lib/base-php.ts b/packages/php-wasm/universal/src/lib/base-php.ts
index 101c348ed4..4ab9eddca2 100644
--- a/packages/php-wasm/universal/src/lib/base-php.ts
+++ b/packages/php-wasm/universal/src/lib/base-php.ts
@@ -53,6 +53,7 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 	#eventListeners: Map<string, Set<PHPEventListener>> = new Map();
 	#messageListeners: MessageListener[] = [];
 	requestHandler?: PHPBrowser;
+	logger = get_logger(this);
 
 	/**
 	 * An exclusive lock that prevent multiple requests from running at
@@ -282,11 +283,12 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 				}
 				return response;
 			} catch (e: any) {
-				get_logger(this).log({
+				this.logger.log({
 					body: e.message,
 					severityNumber: LogSeverity.Error,
 					resource: 'php',
 				});
+				throw e;
 			}
 		} finally {
 			try {
diff --git a/packages/php-wasm/universal/src/lib/logger.ts b/packages/php-wasm/universal/src/lib/logger.ts
index 1c9ba03ba5..38e5db11fe 100644
--- a/packages/php-wasm/universal/src/lib/logger.ts
+++ b/packages/php-wasm/universal/src/lib/logger.ts
@@ -63,7 +63,6 @@ export class Logger {
     constructor(php?: UniversalPHP) {
         this.php = php;
         if (this.php) {
-            console.log('Logger: PHP is available');
             this.php.addEventListener(
                 'request.end',
                 () => {
@@ -109,7 +108,6 @@ export class Logger {
         log.severityText = LogSeverity[log.severityNumber];
 
         this.logs.push(log);
-        console.log(log);
     }
 
     public getLogs(): Log[] {
@@ -124,8 +122,6 @@ export class Logger {
         if (await this.php.fileExists(logPath)) {
             const rawLogs =  await this.php.readFileAsText(logPath);
             console.log(rawLogs);
-        } else {
-            console.log('No logs found');
         }
     }
 

From 46542e547f5e9fe6f0fbd607b3842127dfdaac38 Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Wed, 14 Feb 2024 13:24:01 +0100
Subject: [PATCH 05/30] Return n lines

---
 packages/php-wasm/universal/src/lib/logger.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/php-wasm/universal/src/lib/logger.ts b/packages/php-wasm/universal/src/lib/logger.ts
index 38e5db11fe..389cbfceca 100644
--- a/packages/php-wasm/universal/src/lib/logger.ts
+++ b/packages/php-wasm/universal/src/lib/logger.ts
@@ -1,6 +1,7 @@
 import { BasePHP } from "./base-php";
 import { UniversalPHP } from "./universal-php";
 
+// Log severity levels based on OpenTelemetry https://opentelemetry.io/docs/specs/otel/logs/data-model/#field-severitynumber
 export enum LogSeverity {
     // A dine grained debugging event. Typically disabled in default configurations.
     Trace = 1,
@@ -114,14 +115,24 @@ export class Logger {
         return this.logs;
     }
 
+    private numberOfLogLinesToShow() {
+        //  @TODO Get value from query API
+        return 100;
+    }
+
     public async printWordPressLogs() {
         if (!this.php) {
             return;
         }
+        const linesToShow = this.numberOfLogLinesToShow();
+        if (linesToShow === 0) {
+            return;
+        }
         const logPath = `/tmp/debug.log`;
         if (await this.php.fileExists(logPath)) {
             const rawLogs =  await this.php.readFileAsText(logPath);
-            console.log(rawLogs);
+            const logs = rawLogs.split('\n').slice(-linesToShow).join('\n');
+            console.log(logs);
         }
     }
 

From 315a622a9533b7f19c2e71e3bf7668b79d30b07a Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Fri, 16 Feb 2024 09:28:38 +0100
Subject: [PATCH 06/30] Move logger to website

---
 .../php-wasm/universal/src/lib/base-php.ts    |  41 ++---
 packages/php-wasm/universal/src/lib/logger.ts | 148 ------------------
 .../playground-includes/playground_logger.php |  64 +-------
 packages/playground/website/src/lib/hooks.ts  |   2 +
 packages/playground/website/src/lib/logger.ts | 100 ++++++++++++
 5 files changed, 122 insertions(+), 233 deletions(-)
 delete mode 100644 packages/php-wasm/universal/src/lib/logger.ts
 create mode 100644 packages/playground/website/src/lib/logger.ts

diff --git a/packages/php-wasm/universal/src/lib/base-php.ts b/packages/php-wasm/universal/src/lib/base-php.ts
index 4ab9eddca2..c45b910800 100644
--- a/packages/php-wasm/universal/src/lib/base-php.ts
+++ b/packages/php-wasm/universal/src/lib/base-php.ts
@@ -28,7 +28,6 @@ import {
 	UnhandledRejectionsTarget,
 } from './wasm-error-reporting';
 import { Semaphore, createSpawnHandler, joinPaths } from '@php-wasm/util';
-import { LogSeverity, get_logger } from './logger';
 
 const STRING = 'string';
 const NUMBER = 'number';
@@ -53,7 +52,6 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 	#eventListeners: Map<string, Set<PHPEventListener>> = new Map();
 	#messageListeners: MessageListener[] = [];
 	requestHandler?: PHPBrowser;
-	logger = get_logger(this);
 
 	/**
 	 * An exclusive lock that prevent multiple requests from running at
@@ -266,30 +264,21 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 				this.#setPHPCode(' ?>' + request.code);
 			}
 			this.#addServerGlobalEntriesInWasm();
-			try {
-				const response = await this.#handleRequest();
-				if (request.throwOnError && response.exitCode !== 0) {
-					const output = {
-						stdout: response.text,
-						stderr: response.errors,
-					};
-					console.warn(`PHP.run() output was:`, output);
-					const error = new Error(
-						`PHP.run() failed with exit code ${response.exitCode} and the following output`
-					);
-					// @ts-ignore
-					error.output = output;
-					throw error;
-				}
-				return response;
-			} catch (e: any) {
-				this.logger.log({
-					body: e.message,
-					severityNumber: LogSeverity.Error,
-					resource: 'php',
-				});
-				throw e;
+			const response = await this.#handleRequest();
+			if (request.throwOnError && response.exitCode !== 0) {
+				const output = {
+					stdout: response.text,
+					stderr: response.errors,
+				};
+				console.warn(`PHP.run() output was:`, output);
+				const error = new Error(
+					`PHP.run() failed with exit code ${response.exitCode} and the following output`
+				);
+				// @ts-ignore
+				error.output = output;
+				throw error;
 			}
+			return response;
 		} finally {
 			try {
 				if (heapBodyPointer) {
@@ -781,7 +770,6 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 		// runtime.
 		const oldFS = this[__private__dont__use].FS;
 
-		console.log('PHP runtime exited');
 		// Kill the current runtime
 		try {
 			this.exit();
@@ -811,7 +799,6 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 	}
 
 	exit(code = 0) {
-		console.log('PHP exit()');
 		this.dispatchEvent({
 			type: 'runtime.beforedestroy',
 		});
diff --git a/packages/php-wasm/universal/src/lib/logger.ts b/packages/php-wasm/universal/src/lib/logger.ts
deleted file mode 100644
index 389cbfceca..0000000000
--- a/packages/php-wasm/universal/src/lib/logger.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import { BasePHP } from "./base-php";
-import { UniversalPHP } from "./universal-php";
-
-// Log severity levels based on OpenTelemetry https://opentelemetry.io/docs/specs/otel/logs/data-model/#field-severitynumber
-export enum LogSeverity {
-    // A dine grained debugging event. Typically disabled in default configurations.
-    Trace = 1,
-    // A debugging event.
-    Debug = 5,
-    // An informational event. Indicates that an event happened.
-    Info = 9,
-    // A warning event. Not an error but is likely more important than an informational event.
-    Warn = 13,
-    // An error event. Something went wrong.
-    Error = 17,
-    // A fatal error such as application or system crash.
-    Fatal = 21,
-}
-
-// Log format based on OpenTelemetry https://opentelemetry.io/docs/specs/otel/logs/data-model/
-export type Log = {
-    // Time when the event occurred.
-    timestamp?: number;
-    // Time when the event was observed.
-    observedTimestamp?: number;
-    // Request trace id.
-    traceId?: number;
-    // Request span id.
-    spanId?: number; // Not implemented
-    // W3C trace flag.
-    traceFlags?: number;
-    // The severity text (also known as log level).
-    severityText?: string;
-    // Numerical value of the severity.
-    severityNumber: LogSeverity;
-    // The body of the log record.
-    body: string;
-    // Describes the source of the log.
-    resource?: string;
-    // Describes the scope that emitted the log.
-    instrumentationScope?: string; // Not implemented
-    // Additional information about the event.
-    attributes?: Record<string, string>;
-};
-
-const defaultLog: Log = {
-    timestamp: 0,
-    observedTimestamp: 0,
-    traceId: 0,
-    spanId: 0,
-    traceFlags: 0,
-    severityText: LogSeverity[LogSeverity.Info],
-    severityNumber: LogSeverity.Info,
-    body: '',
-    resource: '',
-    instrumentationScope: '',
-    attributes: {},
-};
-
-export class Logger {
-    private php: UniversalPHP | undefined;
-    private logs: Log[] = [];
-
-    constructor(php?: UniversalPHP) {
-        this.php = php;
-        if (this.php) {
-            this.php.addEventListener(
-                'request.end',
-                () => {
-                    this.printWordPressLogs();
-                }
-            )
-            this.php.onMessage(this.processPhpLogMessage.bind(this));
-        }
-        if ( typeof window !== 'undefined' ) {
-            window.onerror = (message, source, lineno, colno) => {
-                this.log({
-                    body: `${message} in ${source} on line ${lineno}:${colno}`,
-                    severityNumber: LogSeverity.Fatal,
-                    resource: 'javascript',
-                });
-            }
-        }
-    }
-
-    private processPhpLogMessage(message: string) {
-        try {
-            const logMessage = JSON.parse(message);
-            if (logMessage.type === 'wordpress-log') {
-                this.log({
-                   ...logMessage,
-                   severityNumber: LogSeverity[logMessage.severityText as keyof typeof LogSeverity],
-                    resource: 'wordpress',
-                });
-            }
-        } catch (error) {
-            // Not a log message
-        }
-    }
-
-    public log(rawLog: Log): void {
-        const now = Date.now();
-        const log = {
-            ...defaultLog,
-            ...rawLog,
-        };
-        log.timestamp = log.timestamp || now;
-        log.observedTimestamp = now;
-        log.severityText = LogSeverity[log.severityNumber];
-
-        this.logs.push(log);
-    }
-
-    public getLogs(): Log[] {
-        return this.logs;
-    }
-
-    private numberOfLogLinesToShow() {
-        //  @TODO Get value from query API
-        return 100;
-    }
-
-    public async printWordPressLogs() {
-        if (!this.php) {
-            return;
-        }
-        const linesToShow = this.numberOfLogLinesToShow();
-        if (linesToShow === 0) {
-            return;
-        }
-        const logPath = `/tmp/debug.log`;
-        if (await this.php.fileExists(logPath)) {
-            const rawLogs =  await this.php.readFileAsText(logPath);
-            const logs = rawLogs.split('\n').slice(-linesToShow).join('\n');
-            console.log(logs);
-        }
-    }
-
-};
-
-let logger: Logger | undefined = undefined;
-
-export function get_logger(php?: UniversalPHP | BasePHP): Logger {
-    if (!logger) {
-        logger = new Logger(php as UniversalPHP);
-    }
-    return logger;
-}
\ No newline at end of file
diff --git a/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php b/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php
index ab5cfbe904..23cd0b33cb 100644
--- a/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php
+++ b/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php
@@ -1,65 +1,13 @@
 <?php
 // Configure error logging
-// @TODO use the WordPress directory
-$log_file = '/tmp/debug.log';
+$log_file = WP_CONTENT_DIR . '/debug.log';
 error_reporting(E_ALL);
 define('ERROR_LOG_FILE', $log_file);
 ini_set('error_log', $log_file);
+ini_set('ignore_repeated_errors', true);
+ini_set('display_errors', false);
+ini_set('log_errors', true);
 
-/**
- * Get OpenTracing severity text from PHP error code
- *
- * @param int $code PHP error code
- * @return int OpenTracing severity text
- */
-function get_severity_text($code)
-{
-    switch ($code) {
-        case E_ERROR:
-        case E_CORE_ERROR:
-        case E_COMPILE_ERROR:
-        case E_USER_ERROR:
-            return 'Error';
-        case E_WARNING:
-        case E_CORE_WARNING:
-        case E_COMPILE_WARNING:
-        case E_USER_WARNING:
-            return 'Warning';
-        case E_NOTICE:
-        case E_USER_NOTICE:
-            return 'Info';
-        default:
-            return 'Debug';
-    }
-}
+error_log('playground_logger.php loaded');
 
-/**
- * Send log message to JS
- */
-function playground_error_handler($errno, $errstr, $errfile, $errline)
-{
-    post_message_to_js(
-        json_encode([
-            'event' => 'wordpress-log',
-            'timestamp' => time(),
-            'severityText' => get_severity_text($errno),
-            'body' => "$errstr in $errfile on line $errline",
-        ])
-    );
-    return false;
-}
-
-set_error_handler('playground_error_handler', E_ALL);
-
-/**
- * Collect last error on shutdown
- */
-function collect_last_error_on_shutdown()
-{
-    $error = error_get_last();
-    if ($error !== null) {
-        playground_error_handler($error['type'], $error['message'], $error['file'], $error['line']);
-    }
-}
-
-register_shutdown_function('collect_last_error_on_shutdown');
+throw new Exception('test');
diff --git a/packages/playground/website/src/lib/hooks.ts b/packages/playground/website/src/lib/hooks.ts
index 18c448ac9f..b3140c68c0 100644
--- a/packages/playground/website/src/lib/hooks.ts
+++ b/packages/playground/website/src/lib/hooks.ts
@@ -2,6 +2,7 @@ import { useEffect, useRef, useState } from 'react';
 import { Blueprint, startPlaygroundWeb } from '@wp-playground/client';
 import type { PlaygroundClient } from '@wp-playground/client';
 import { getRemoteUrl } from './config';
+import { get_logger } from './logger';
 
 interface UsePlaygroundOptions {
 	blueprint?: Blueprint;
@@ -34,6 +35,7 @@ export function usePlayground({ blueprint, storage }: UsePlaygroundOptions) {
 			remoteUrl.searchParams.set('storage', storage);
 		}
 
+		get_logger(undefined);
 		startPlaygroundWeb({
 			iframe,
 			remoteUrl: remoteUrl.toString(),
diff --git a/packages/playground/website/src/lib/logger.ts b/packages/playground/website/src/lib/logger.ts
new file mode 100644
index 0000000000..6ed08ba606
--- /dev/null
+++ b/packages/playground/website/src/lib/logger.ts
@@ -0,0 +1,100 @@
+import { BasePHP } from "@php-wasm/universal/src/lib/base-php";
+import { UniversalPHP } from "@php-wasm/universal/src/lib/universal-php";
+
+export enum LogSeverity {
+    // A debugging event.
+    Debug,
+    // An informational event. Indicates that an event happenedate.
+    Info,
+    // A warning event. Not an error but is likely more important than an informational event.
+    Warn,
+    // An error event. Something went wrong.
+    Error,
+    // A fatal error such as application or system crash.
+    Fatal,
+}
+
+export class Logger {
+    private php: UniversalPHP | undefined;
+
+    private readonly LOG_PREFIX = 'Playground';
+
+    constructor(php?: UniversalPHP) {
+        this.php = php;
+        if (this.php) {
+            this.php.addEventListener(
+                'request.end',
+                () => {
+                    this.printPhpErrorLog();
+                }
+            )
+        }
+        this.collectPlaygroundLogs();
+    }
+
+    private collectPlaygroundLogs() {
+        if (typeof window !== 'undefined') {
+            window.addEventListener('error', (event) => {
+                this.log(
+                    `${event.message} in ${event.filename} on line ${event.lineno}:${event.colno}`,
+                    LogSeverity.Fatal
+                );
+            });
+            window.addEventListener('unhandledrejection', (event) => {
+                console.log(event);
+                this.log(
+                    `${event.reason.stack}`,
+                    LogSeverity.Fatal
+                );
+            });
+        }
+    }
+
+    /**
+     * Get UTC date in the PHP log format https://github.com/php/php-src/blob/master/main/main.c#L849
+     *
+     * @param date
+     * @returns string
+     */
+    private formatLogDate(date: Date): string {
+        const day = String(date.getUTCDate()).padStart(2, '0');
+        const monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+        const month = monthNames[date.getUTCMonth()];
+        const year = date.getUTCFullYear();
+        const hours = String(date.getUTCHours()).padStart(2, '0');
+        const minutes = String(date.getUTCMinutes()).padStart(2, '0');
+        const seconds = String(date.getUTCSeconds()).padStart(2, '0');
+
+        return `${day}-${month}-${year} ${hours}:${minutes}:${seconds} UTC`;
+    }
+
+    public log(message: string, severity?: LogSeverity): void {
+        if (severity === undefined) {
+            severity = LogSeverity.Info;
+        }
+        const now = this.formatLogDate(new Date());
+        const log = `[${now}] ${this.LOG_PREFIX} ${LogSeverity[severity]}: ${message}`;
+        console.debug(log);
+    }
+
+    public async printPhpErrorLog() {
+        if (!this.php) {
+            return;
+        }
+        const logPath = `/wordpress/wp-content/debug.log`;
+        if (await this.php.fileExists(logPath)) {
+            const logs =  await this.php.readFileAsText(logPath);
+            console.debug(logs);
+        }
+    }
+
+};
+
+let logger: Logger | undefined = undefined;
+
+export function get_logger(php?: UniversalPHP | BasePHP): Logger {
+    if (!logger) {
+        logger = new Logger(php as UniversalPHP);
+    }
+    return logger;
+}
\ No newline at end of file

From c23dd927a92501fa94fd38d6eebc0d0ff39699eb Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Fri, 16 Feb 2024 12:34:19 +0100
Subject: [PATCH 07/30] Display debug.log for request

---
 packages/php-wasm/universal/src/lib/base-php.ts   | 12 ++++++++++++
 .../php-wasm/universal/src/lib/universal-php.ts   |  1 +
 .../playground-includes/playground_logger.php     |  6 +-----
 .../playground/remote/src/lib/worker-thread.ts    |  9 +++++++++
 packages/playground/website/src/lib/hooks.ts      | 15 ++++++++++++---
 packages/playground/website/src/lib/logger.ts     |  7 +++++--
 6 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/packages/php-wasm/universal/src/lib/base-php.ts b/packages/php-wasm/universal/src/lib/base-php.ts
index c45b910800..fd9356e5f1 100644
--- a/packages/php-wasm/universal/src/lib/base-php.ts
+++ b/packages/php-wasm/universal/src/lib/base-php.ts
@@ -234,6 +234,14 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 		return this.requestHandler.request(request, maxRedirects);
 	}
 
+	getPhpErrorLog() {
+		const logPath = '/wordpress/wp-content/debug.log';
+		if (!this.fileExists(logPath)) {
+			return '';
+		}
+		return this.readFileAsText(logPath);
+	}
+
 	/** @inheritDoc */
 	async run(request: PHPRunOptions): Promise<PHPResponse> {
 		/*
@@ -243,6 +251,7 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 		 * be dispatched before the first one is finished.
 		 */
 		const release = await this.semaphore.acquire();
+		const logSize = this.getPhpErrorLog().length;
 		let heapBodyPointer;
 		try {
 			if (!this.#webSapiInitialized) {
@@ -288,6 +297,9 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 				release();
 				this.dispatchEvent({
 					type: 'request.end',
+					data: {
+						log: this.getPhpErrorLog().substring(logSize),
+					},
 				});
 			}
 		}
diff --git a/packages/php-wasm/universal/src/lib/universal-php.ts b/packages/php-wasm/universal/src/lib/universal-php.ts
index f75d734f25..74210dbaf8 100644
--- a/packages/php-wasm/universal/src/lib/universal-php.ts
+++ b/packages/php-wasm/universal/src/lib/universal-php.ts
@@ -6,6 +6,7 @@ import { PHPResponse } from './php-response';
  */
 export interface PHPRequestEndEvent {
 	type: 'request.end';
+	data?: {[log: string]: string};
 }
 
 /**
diff --git a/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php b/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php
index 23cd0b33cb..acb45646d5 100644
--- a/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php
+++ b/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php
@@ -6,8 +6,4 @@
 ini_set('error_log', $log_file);
 ini_set('ignore_repeated_errors', true);
 ini_set('display_errors', false);
-ini_set('log_errors', true);
-
-error_log('playground_logger.php loaded');
-
-throw new Exception('test');
+ini_set('log_errors', true);
\ No newline at end of file
diff --git a/packages/playground/remote/src/lib/worker-thread.ts b/packages/playground/remote/src/lib/worker-thread.ts
index 0401c73b80..b669d5f9ef 100644
--- a/packages/playground/remote/src/lib/worker-thread.ts
+++ b/packages/playground/remote/src/lib/worker-thread.ts
@@ -268,6 +268,15 @@ try {
 		});
 	}
 
+	// Enable the WordPress debug mode
+	await defineWpConfigConsts(php, {
+		consts: {
+			WP_DEBUG: true,
+			WP_DEBUG_LOG: true,
+			WP_DEBUG_DISPLAY: false,
+		},
+	});
+
 	// Always install the playground mu-plugin, even if WordPress is loaded
 	// from the OPFS. This ensures:
 	// * The mu-plugin is always there, even when a custom WordPress directory
diff --git a/packages/playground/website/src/lib/hooks.ts b/packages/playground/website/src/lib/hooks.ts
index b3140c68c0..313c96a144 100644
--- a/packages/playground/website/src/lib/hooks.ts
+++ b/packages/playground/website/src/lib/hooks.ts
@@ -2,7 +2,8 @@ import { useEffect, useRef, useState } from 'react';
 import { Blueprint, startPlaygroundWeb } from '@wp-playground/client';
 import type { PlaygroundClient } from '@wp-playground/client';
 import { getRemoteUrl } from './config';
-import { get_logger } from './logger';
+import { LogSeverity, get_logger } from './logger';
+import { PHPRequestEndEvent } from '@php-wasm/universal/src/lib/universal-php';
 
 interface UsePlaygroundOptions {
 	blueprint?: Blueprint;
@@ -35,15 +36,23 @@ export function usePlayground({ blueprint, storage }: UsePlaygroundOptions) {
 			remoteUrl.searchParams.set('storage', storage);
 		}
 
-		get_logger(undefined);
+		const logger = get_logger(undefined);
 		startPlaygroundWeb({
 			iframe,
 			remoteUrl: remoteUrl.toString(),
 			blueprint,
 		}).then(async (playground) => {
 			playground.onNavigation((url) => setUrl(url));
+			playground.addEventListener('request.end', (event) => {
+				event = event as PHPRequestEndEvent;
+				if (event.data && event.data.log) {
+					logger.logRaw(event?.data.log);
+				}
+			} );
 			setPlayground(() => playground);
-		});
+		}).catch((error) => {
+			logger.log(error, LogSeverity.Fatal);
+		} );
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [iframe, awaitedIframe]);
 
diff --git a/packages/playground/website/src/lib/logger.ts b/packages/playground/website/src/lib/logger.ts
index 6ed08ba606..d7b94bbaa2 100644
--- a/packages/playground/website/src/lib/logger.ts
+++ b/packages/playground/website/src/lib/logger.ts
@@ -33,7 +33,7 @@ export class Logger {
     }
 
     private collectPlaygroundLogs() {
-        if (typeof window !== 'undefined') {
+         if (typeof window !== 'undefined') {
             window.addEventListener('error', (event) => {
                 this.log(
                     `${event.message} in ${event.filename} on line ${event.lineno}:${event.colno}`,
@@ -41,7 +41,6 @@ export class Logger {
                 );
             });
             window.addEventListener('unhandledrejection', (event) => {
-                console.log(event);
                 this.log(
                     `${event.reason.stack}`,
                     LogSeverity.Fatal
@@ -74,6 +73,10 @@ export class Logger {
         }
         const now = this.formatLogDate(new Date());
         const log = `[${now}] ${this.LOG_PREFIX} ${LogSeverity[severity]}: ${message}`;
+        this.logRaw(log);
+    }
+
+    public logRaw(log: string): void {
         console.debug(log);
     }
 

From 60aa62f10a38713e67598934eca8dba69adc5268 Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Fri, 16 Feb 2024 13:37:29 +0100
Subject: [PATCH 08/30] Rewrite compiler error to return all error data

---
 packages/php-wasm/universal/src/lib/base-php.ts | 17 ++++++++++++++---
 .../php-wasm/universal/src/lib/universal-php.ts |  5 +++++
 .../playground/blueprints/src/lib/compile.ts    | 14 ++++++--------
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/packages/php-wasm/universal/src/lib/base-php.ts b/packages/php-wasm/universal/src/lib/base-php.ts
index fd9356e5f1..e87bc71289 100644
--- a/packages/php-wasm/universal/src/lib/base-php.ts
+++ b/packages/php-wasm/universal/src/lib/base-php.ts
@@ -53,6 +53,9 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 	#messageListeners: MessageListener[] = [];
 	requestHandler?: PHPBrowser;
 
+	// The pointer in the PHP log file where the last request ended.
+	logStartPosition = 0;
+
 	/**
 	 * An exclusive lock that prevent multiple requests from running at
 	 * the same time.
@@ -79,6 +82,9 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 				new PHPRequestHandler(this, serverOptions)
 			);
 		}
+
+		// Use the log length as the start position for the current request.
+		this.logStartPosition = this.#getPhpErrorLog().length;
 	}
 
 	addEventListener(eventType: PHPEvent['type'], listener: PHPEventListener) {
@@ -234,7 +240,7 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 		return this.requestHandler.request(request, maxRedirects);
 	}
 
-	getPhpErrorLog() {
+	#getPhpErrorLog() {
 		const logPath = '/wordpress/wp-content/debug.log';
 		if (!this.fileExists(logPath)) {
 			return '';
@@ -242,6 +248,12 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 		return this.readFileAsText(logPath);
 	}
 
+	/** @inheritDoc */
+	getRequestPhpErrorLog() {
+		console.log(this.#getPhpErrorLog());
+		return this.#getPhpErrorLog().substring(this.logStartPosition);
+	}
+
 	/** @inheritDoc */
 	async run(request: PHPRunOptions): Promise<PHPResponse> {
 		/*
@@ -251,7 +263,6 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 		 * be dispatched before the first one is finished.
 		 */
 		const release = await this.semaphore.acquire();
-		const logSize = this.getPhpErrorLog().length;
 		let heapBodyPointer;
 		try {
 			if (!this.#webSapiInitialized) {
@@ -298,7 +309,7 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 				this.dispatchEvent({
 					type: 'request.end',
 					data: {
-						log: this.getPhpErrorLog().substring(logSize),
+						log: this.getRequestPhpErrorLog(),
 					},
 				});
 			}
diff --git a/packages/php-wasm/universal/src/lib/universal-php.ts b/packages/php-wasm/universal/src/lib/universal-php.ts
index 74210dbaf8..8ea372a016 100644
--- a/packages/php-wasm/universal/src/lib/universal-php.ts
+++ b/packages/php-wasm/universal/src/lib/universal-php.ts
@@ -323,6 +323,11 @@ export interface IsomorphicLocalPHP extends RequestHandler {
 	 */
 	chdir(path: string): void;
 
+	/**
+	 * Get PHP error log data for the current request.
+	 */
+	getRequestPhpErrorLog(): string;
+
 	/**
 	 * Runs PHP code.
 	 *
diff --git a/packages/playground/blueprints/src/lib/compile.ts b/packages/playground/blueprints/src/lib/compile.ts
index 0e3e614463..56de3664b7 100644
--- a/packages/playground/blueprints/src/lib/compile.ts
+++ b/packages/playground/blueprints/src/lib/compile.ts
@@ -237,14 +237,12 @@ export function compileBlueprint(
 						onStepCompleted(result, step);
 					} catch (e) {
 						console.error(e);
-						throw new Error(
-							`Error when executing the blueprint step #${i} (${JSON.stringify(
-								step
-							)}). Inspect the "cause" property of this error for more details`,
-							{
-								cause: e,
-							}
-						);
+						let message = playground.getRequestPhpErrorLog() + '\n';
+						message += `Error when executing the blueprint step #${i} (${JSON.stringify(
+							step
+						)})`;
+						message += e instanceof Error ? `: ${e.message}` : e;
+						throw new Error(message);
 					}
 				}
 			} finally {

From 0923c3e7b6a453447ecbec907a7118200ccc1faf Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Fri, 16 Feb 2024 13:38:51 +0100
Subject: [PATCH 09/30] Remove test log

---
 packages/php-wasm/universal/src/lib/base-php.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/php-wasm/universal/src/lib/base-php.ts b/packages/php-wasm/universal/src/lib/base-php.ts
index e87bc71289..6ab8a83ad1 100644
--- a/packages/php-wasm/universal/src/lib/base-php.ts
+++ b/packages/php-wasm/universal/src/lib/base-php.ts
@@ -250,7 +250,6 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 
 	/** @inheritDoc */
 	getRequestPhpErrorLog() {
-		console.log(this.#getPhpErrorLog());
 		return this.#getPhpErrorLog().substring(this.logStartPosition);
 	}
 

From 6d6bdafb420a24c0b542c76e68eaa6abea3793ea Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Fri, 16 Feb 2024 14:02:44 +0100
Subject: [PATCH 10/30] Clean up

---
 .../playground/blueprints/src/lib/compile.ts  |  5 ++--
 packages/playground/website/src/lib/hooks.ts  |  2 +-
 packages/playground/website/src/lib/logger.ts | 29 ++-----------------
 3 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/packages/playground/blueprints/src/lib/compile.ts b/packages/playground/blueprints/src/lib/compile.ts
index 56de3664b7..d447aae1eb 100644
--- a/packages/playground/blueprints/src/lib/compile.ts
+++ b/packages/playground/blueprints/src/lib/compile.ts
@@ -237,8 +237,9 @@ export function compileBlueprint(
 						onStepCompleted(result, step);
 					} catch (e) {
 						console.error(e);
-						let message = playground.getRequestPhpErrorLog() + '\n';
-						message += `Error when executing the blueprint step #${i} (${JSON.stringify(
+						// @TODO This should return logs from the PHP process
+						let message = await playground.getRequestPhpErrorLog();
+						message += `\n Error when executing the blueprint step #${i} (${JSON.stringify(
 							step
 						)})`;
 						message += e instanceof Error ? `: ${e.message}` : e;
diff --git a/packages/playground/website/src/lib/hooks.ts b/packages/playground/website/src/lib/hooks.ts
index 313c96a144..15d9b52f61 100644
--- a/packages/playground/website/src/lib/hooks.ts
+++ b/packages/playground/website/src/lib/hooks.ts
@@ -36,7 +36,7 @@ export function usePlayground({ blueprint, storage }: UsePlaygroundOptions) {
 			remoteUrl.searchParams.set('storage', storage);
 		}
 
-		const logger = get_logger(undefined);
+		const logger = get_logger();
 		startPlaygroundWeb({
 			iframe,
 			remoteUrl: remoteUrl.toString(),
diff --git a/packages/playground/website/src/lib/logger.ts b/packages/playground/website/src/lib/logger.ts
index d7b94bbaa2..f344657b69 100644
--- a/packages/playground/website/src/lib/logger.ts
+++ b/packages/playground/website/src/lib/logger.ts
@@ -15,20 +15,9 @@ export enum LogSeverity {
 }
 
 export class Logger {
-    private php: UniversalPHP | undefined;
-
     private readonly LOG_PREFIX = 'Playground';
 
-    constructor(php?: UniversalPHP) {
-        this.php = php;
-        if (this.php) {
-            this.php.addEventListener(
-                'request.end',
-                () => {
-                    this.printPhpErrorLog();
-                }
-            )
-        }
+    constructor() {
         this.collectPlaygroundLogs();
     }
 
@@ -79,25 +68,13 @@ export class Logger {
     public logRaw(log: string): void {
         console.debug(log);
     }
-
-    public async printPhpErrorLog() {
-        if (!this.php) {
-            return;
-        }
-        const logPath = `/wordpress/wp-content/debug.log`;
-        if (await this.php.fileExists(logPath)) {
-            const logs =  await this.php.readFileAsText(logPath);
-            console.debug(logs);
-        }
-    }
-
 };
 
 let logger: Logger | undefined = undefined;
 
-export function get_logger(php?: UniversalPHP | BasePHP): Logger {
+export function get_logger(): Logger {
     if (!logger) {
-        logger = new Logger(php as UniversalPHP);
+        logger = new Logger();
     }
     return logger;
 }
\ No newline at end of file

From b84bdc06e529b171064779766a28fcbd568e2d0d Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Mon, 19 Feb 2024 08:12:17 +0100
Subject: [PATCH 11/30] Collect PHP logs on compile error

---
 .../php-wasm/universal/src/lib/base-php.ts    |    6 +-
 .../universal/src/lib/universal-php.ts        |    5 +
 .../php-wasm/web/src/lib/web-php-endpoint.ts  |   10 +
 .../blueprints/public/blueprint-schema.json   | 2866 +++++++++--------
 .../playground/blueprints/src/lib/compile.ts  |   10 +-
 packages/playground/website/src/lib/logger.ts |   36 +-
 6 files changed, 1582 insertions(+), 1351 deletions(-)

diff --git a/packages/php-wasm/universal/src/lib/base-php.ts b/packages/php-wasm/universal/src/lib/base-php.ts
index 6ab8a83ad1..bd4e914cd1 100644
--- a/packages/php-wasm/universal/src/lib/base-php.ts
+++ b/packages/php-wasm/universal/src/lib/base-php.ts
@@ -84,7 +84,7 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 		}
 
 		// Use the log length as the start position for the current request.
-		this.logStartPosition = this.#getPhpErrorLog().length;
+		this.logStartPosition = this.getPhpErrorLog().length;
 	}
 
 	addEventListener(eventType: PHPEvent['type'], listener: PHPEventListener) {
@@ -240,7 +240,7 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 		return this.requestHandler.request(request, maxRedirects);
 	}
 
-	#getPhpErrorLog() {
+	getPhpErrorLog() {
 		const logPath = '/wordpress/wp-content/debug.log';
 		if (!this.fileExists(logPath)) {
 			return '';
@@ -250,7 +250,7 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 
 	/** @inheritDoc */
 	getRequestPhpErrorLog() {
-		return this.#getPhpErrorLog().substring(this.logStartPosition);
+		return this.getPhpErrorLog().substring(this.logStartPosition);
 	}
 
 	/** @inheritDoc */
diff --git a/packages/php-wasm/universal/src/lib/universal-php.ts b/packages/php-wasm/universal/src/lib/universal-php.ts
index 8ea372a016..f98d3ce5cb 100644
--- a/packages/php-wasm/universal/src/lib/universal-php.ts
+++ b/packages/php-wasm/universal/src/lib/universal-php.ts
@@ -323,6 +323,11 @@ export interface IsomorphicLocalPHP extends RequestHandler {
 	 */
 	chdir(path: string): void;
 
+	/**
+	 * Get all PHP error log data.
+	*/
+	getPhpErrorLog(): string;
+
 	/**
 	 * Get PHP error log data for the current request.
 	 */
diff --git a/packages/php-wasm/web/src/lib/web-php-endpoint.ts b/packages/php-wasm/web/src/lib/web-php-endpoint.ts
index 75d936845d..76e12bc42b 100644
--- a/packages/php-wasm/web/src/lib/web-php-endpoint.ts
+++ b/packages/php-wasm/web/src/lib/web-php-endpoint.ts
@@ -99,6 +99,16 @@ export class WebPHPEndpoint implements IsomorphicLocalPHP {
 		return _private.get(this)!.php.request(request, redirects);
 	}
 
+	/** @inheritDoc @php-wasm/universal!RequestHandler.getPhpErrorLog */
+	getPhpErrorLog() {
+		return _private.get(this)!.php.getPhpErrorLog();
+	}
+
+	/** @inheritDoc @php-wasm/universal!RequestHandler.getRequestPhpErrorLog */
+	getRequestPhpErrorLog() {
+		return _private.get(this)!.php.getRequestPhpErrorLog();
+	}
+
 	/** @inheritDoc @php-wasm/web!WebPHP.run */
 	async run(request: PHPRunOptions): Promise<PHPResponse> {
 		return _private.get(this)!.php.run(request);
diff --git a/packages/playground/blueprints/public/blueprint-schema.json b/packages/playground/blueprints/public/blueprint-schema.json
index 4c6a1405c3..ffe284d680 100644
--- a/packages/playground/blueprints/public/blueprint-schema.json
+++ b/packages/playground/blueprints/public/blueprint-schema.json
@@ -1,1340 +1,1528 @@
 {
-	"$schema": "http://json-schema.org/schema",
-	"$ref": "#/definitions/Blueprint",
-	"definitions": {
-		"Blueprint": {
-			"type": "object",
-			"properties": {
-				"landingPage": {
-					"type": "string",
-					"description": "The URL to navigate to after the blueprint has been run."
-				},
-				"description": {
-					"type": "string",
-					"description": "Optional description. It doesn't do anything but is exposed as a courtesy to developers who may want to document which blueprint file does what."
-				},
-				"preferredVersions": {
-					"type": "object",
-					"properties": {
-						"php": {
-							"anyOf": [
-								{
-									"$ref": "#/definitions/SupportedPHPVersion"
-								},
-								{
-									"type": "string",
-									"const": "latest"
-								}
-							],
-							"description": "The preferred PHP version to use. If not specified, the latest supported version will be used"
-						},
-						"wp": {
-							"type": "string",
-							"description": "The preferred WordPress version to use. If not specified, the latest supported version will be used"
-						}
-					},
-					"required": ["php", "wp"],
-					"additionalProperties": false,
-					"description": "The preferred PHP and WordPress versions to use."
-				},
-				"features": {
-					"type": "object",
-					"properties": {
-						"networking": {
-							"type": "boolean",
-							"description": "Should boot with support for network request via wp_safe_remote_get?"
-						}
-					},
-					"additionalProperties": false
-				},
-				"constants": {
-					"type": "object",
-					"additionalProperties": {
-						"type": "string"
-					},
-					"description": "PHP Constants to define on every request",
-					"deprecated": "This experimental option will change without warning.\nUse `steps` instead."
-				},
-				"plugins": {
-					"type": "array",
-					"items": {
-						"anyOf": [
-							{
-								"type": "string"
-							},
-							{
-								"$ref": "#/definitions/FileReference"
-							}
-						]
-					},
-					"description": "WordPress plugins to install and activate",
-					"deprecated": "This experimental option will change without warning.\nUse `steps` instead."
-				},
-				"siteOptions": {
-					"type": "object",
-					"additionalProperties": {
-						"type": "string"
-					},
-					"properties": {
-						"blogname": {
-							"type": "string",
-							"description": "The site title"
-						}
-					},
-					"description": "WordPress site options to define",
-					"deprecated": "This experimental option will change without warning.\nUse `steps` instead."
-				},
-				"login": {
-					"anyOf": [
-						{
-							"type": "boolean"
-						},
-						{
-							"type": "object",
-							"properties": {
-								"username": {
-									"type": "string"
-								},
-								"password": {
-									"type": "string"
-								}
-							},
-							"required": ["username", "password"],
-							"additionalProperties": false
-						}
-					],
-					"description": "User to log in as. If true, logs the user in as admin/password."
-				},
-				"phpExtensionBundles": {
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/SupportedPHPExtensionBundle"
-					},
-					"description": "The PHP extensions to use."
-				},
-				"steps": {
-					"type": "array",
-					"items": {
-						"anyOf": [
-							{
-								"$ref": "#/definitions/StepDefinition"
-							},
-							{
-								"type": "string"
-							},
-							{
-								"not": {}
-							},
-							{
-								"type": "boolean",
-								"const": false
-							},
-							{
-								"type": "null"
-							}
-						]
-					},
-					"description": "The steps to run after every other operation in this Blueprint was executed."
-				},
-				"$schema": {
-					"type": "string"
-				}
-			},
-			"additionalProperties": false
-		},
-		"SupportedPHPVersion": {
-			"type": "string",
-			"enum": [
-				"8.3",
-				"8.2",
-				"8.1",
-				"8.0",
-				"7.4",
-				"7.3",
-				"7.2",
-				"7.1",
-				"7.0"
-			]
-		},
-		"FileReference": {
-			"anyOf": [
-				{
-					"$ref": "#/definitions/VFSReference"
-				},
-				{
-					"$ref": "#/definitions/LiteralReference"
-				},
-				{
-					"$ref": "#/definitions/CoreThemeReference"
-				},
-				{
-					"$ref": "#/definitions/CorePluginReference"
-				},
-				{
-					"$ref": "#/definitions/UrlReference"
-				}
-			]
-		},
-		"VFSReference": {
-			"type": "object",
-			"properties": {
-				"resource": {
-					"type": "string",
-					"const": "vfs",
-					"description": "Identifies the file resource as Virtual File System (VFS)"
-				},
-				"path": {
-					"type": "string",
-					"description": "The path to the file in the VFS"
-				}
-			},
-			"required": ["resource", "path"],
-			"additionalProperties": false
-		},
-		"LiteralReference": {
-			"type": "object",
-			"properties": {
-				"resource": {
-					"type": "string",
-					"const": "literal",
-					"description": "Identifies the file resource as a literal file"
-				},
-				"name": {
-					"type": "string",
-					"description": "The name of the file"
-				},
-				"contents": {
-					"anyOf": [
-						{
-							"type": "string"
-						},
-						{
-							"type": "object",
-							"properties": {
-								"BYTES_PER_ELEMENT": {
-									"type": "number"
-								},
-								"buffer": {
-									"type": "object",
-									"properties": {
-										"byteLength": {
-											"type": "number"
-										}
-									},
-									"required": ["byteLength"],
-									"additionalProperties": false
-								},
-								"byteLength": {
-									"type": "number"
-								},
-								"byteOffset": {
-									"type": "number"
-								},
-								"length": {
-									"type": "number"
-								}
-							},
-							"required": [
-								"BYTES_PER_ELEMENT",
-								"buffer",
-								"byteLength",
-								"byteOffset",
-								"length"
-							],
-							"additionalProperties": {
-								"type": "number"
-							}
-						}
-					],
-					"description": "The contents of the file"
-				}
-			},
-			"required": ["resource", "name", "contents"],
-			"additionalProperties": false
-		},
-		"CoreThemeReference": {
-			"type": "object",
-			"properties": {
-				"resource": {
-					"type": "string",
-					"const": "wordpress.org/themes",
-					"description": "Identifies the file resource as a WordPress Core theme"
-				},
-				"slug": {
-					"type": "string",
-					"description": "The slug of the WordPress Core theme"
-				}
-			},
-			"required": ["resource", "slug"],
-			"additionalProperties": false
-		},
-		"CorePluginReference": {
-			"type": "object",
-			"properties": {
-				"resource": {
-					"type": "string",
-					"const": "wordpress.org/plugins",
-					"description": "Identifies the file resource as a WordPress Core plugin"
-				},
-				"slug": {
-					"type": "string",
-					"description": "The slug of the WordPress Core plugin"
-				}
-			},
-			"required": ["resource", "slug"],
-			"additionalProperties": false
-		},
-		"UrlReference": {
-			"type": "object",
-			"properties": {
-				"resource": {
-					"type": "string",
-					"const": "url",
-					"description": "Identifies the file resource as a URL"
-				},
-				"url": {
-					"type": "string",
-					"description": "The URL of the file"
-				},
-				"caption": {
-					"type": "string",
-					"description": "Optional caption for displaying a progress message"
-				}
-			},
-			"required": ["resource", "url"],
-			"additionalProperties": false
-		},
-		"SupportedPHPExtensionBundle": {
-			"type": "string",
-			"const": "kitchen-sink"
-		},
-		"StepDefinition": {
-			"type": "object",
-			"discriminator": {
-				"propertyName": "step"
-			},
-			"required": ["step"],
-			"oneOf": [
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "activatePlugin"
-						},
-						"pluginPath": {
-							"type": "string",
-							"description": "Path to the plugin directory as absolute path (/wordpress/wp-content/plugins/plugin-name); or the plugin entry file relative to the plugins directory (plugin-name/plugin-name.php)."
-						},
-						"pluginName": {
-							"type": "string",
-							"description": "Optional. Plugin name to display in the progress bar."
-						}
-					},
-					"required": ["pluginPath", "step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "activateTheme"
-						},
-						"themeFolderName": {
-							"type": "string",
-							"description": "The name of the theme folder inside wp-content/themes/"
-						}
-					},
-					"required": ["step", "themeFolderName"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "cp"
-						},
-						"fromPath": {
-							"type": "string",
-							"description": "Source path"
-						},
-						"toPath": {
-							"type": "string",
-							"description": "Target path"
-						}
-					},
-					"required": ["fromPath", "step", "toPath"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "defineWpConfigConsts"
-						},
-						"consts": {
-							"type": "object",
-							"additionalProperties": {},
-							"description": "The constants to define"
-						},
-						"method": {
-							"type": "string",
-							"enum": ["rewrite-wp-config", "define-before-run"],
-							"description": "The method of defining the constants. Possible values are:\n\n- rewrite-wp-config: Default. Rewrites the wp-config.php file to                      explicitly call define() with the requested                      name and value. This method alters the file                      on the disk, but it doesn't conflict with                      existing define() calls in wp-config.php.\n- define-before-run: Defines the constant before running the requested                      script. It doesn't alter any files on the disk, but                      constants defined this way may conflict with existing                      define() calls in wp-config.php."
-						},
-						"virtualize": {
-							"type": "boolean",
-							"deprecated": "This option is noop and will be removed in a future version.\nThis option is only kept in here to avoid breaking Blueprint schema validation\nfor existing apps using this option."
-						}
-					},
-					"required": ["consts", "step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "defineSiteUrl"
-						},
-						"siteUrl": {
-							"type": "string",
-							"description": "The URL"
-						}
-					},
-					"required": ["siteUrl", "step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "enableMultisite"
-						}
-					},
-					"required": ["step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "importFile"
-						},
-						"file": {
-							"$ref": "#/definitions/FileReference",
-							"description": "The file to import"
-						}
-					},
-					"required": ["file", "step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "importWordPressFiles"
-						},
-						"wordPressFilesZip": {
-							"$ref": "#/definitions/FileReference",
-							"description": "The zip file containing the top-level WordPress files and directories."
-						},
-						"pathInZip": {
-							"type": "string",
-							"description": "The path inside the zip file where the WordPress files are."
-						}
-					},
-					"required": ["step", "wordPressFilesZip"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "installPlugin",
-							"description": "The step identifier."
-						},
-						"pluginZipFile": {
-							"$ref": "#/definitions/FileReference",
-							"description": "The plugin zip file to install."
-						},
-						"options": {
-							"$ref": "#/definitions/InstallPluginOptions",
-							"description": "Optional installation options."
-						}
-					},
-					"required": ["pluginZipFile", "step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "installTheme",
-							"description": "The step identifier."
-						},
-						"themeZipFile": {
-							"$ref": "#/definitions/FileReference",
-							"description": "The theme zip file to install."
-						},
-						"options": {
-							"type": "object",
-							"properties": {
-								"activate": {
-									"type": "boolean",
-									"description": "Whether to activate the theme after installing it."
-								}
-							},
-							"additionalProperties": false,
-							"description": "Optional installation options."
-						}
-					},
-					"required": ["step", "themeZipFile"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "login"
-						},
-						"username": {
-							"type": "string",
-							"description": "The user to log in as. Defaults to 'admin'."
-						},
-						"password": {
-							"type": "string",
-							"description": "The password to log in with. Defaults to 'password'."
-						}
-					},
-					"required": ["step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "mkdir"
-						},
-						"path": {
-							"type": "string",
-							"description": "The path of the directory you want to create"
-						}
-					},
-					"required": ["path", "step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "mv"
-						},
-						"fromPath": {
-							"type": "string",
-							"description": "Source path"
-						},
-						"toPath": {
-							"type": "string",
-							"description": "Target path"
-						}
-					},
-					"required": ["fromPath", "step", "toPath"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "request"
-						},
-						"request": {
-							"$ref": "#/definitions/PHPRequest",
-							"description": "Request details (See /wordpress-playground/api/universal/interface/PHPRequest)"
-						}
-					},
-					"required": ["request", "step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "rm"
-						},
-						"path": {
-							"type": "string",
-							"description": "The path to remove"
-						}
-					},
-					"required": ["path", "step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "rmdir"
-						},
-						"path": {
-							"type": "string",
-							"description": "The path to remove"
-						}
-					},
-					"required": ["path", "step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "runPHP",
-							"description": "The step identifier."
-						},
-						"code": {
-							"type": "string",
-							"description": "The PHP code to run."
-						}
-					},
-					"required": ["code", "step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "runPHPWithOptions"
-						},
-						"options": {
-							"$ref": "#/definitions/PHPRunOptions",
-							"description": "Run options (See /wordpress-playground/api/universal/interface/PHPRunOptions)"
-						}
-					},
-					"required": ["options", "step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "runWpInstallationWizard"
-						},
-						"options": {
-							"$ref": "#/definitions/WordPressInstallationOptions"
-						}
-					},
-					"required": ["options", "step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "runSql",
-							"description": "The step identifier."
-						},
-						"sql": {
-							"$ref": "#/definitions/FileReference",
-							"description": "The SQL to run. Each non-empty line must contain a valid SQL query."
-						}
-					},
-					"required": ["sql", "step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "setPhpIniEntry"
-						},
-						"key": {
-							"type": "string",
-							"description": "Entry name e.g. \"display_errors\""
-						},
-						"value": {
-							"type": "string",
-							"description": "Entry value as a string e.g. \"1\""
-						}
-					},
-					"required": ["key", "step", "value"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "setSiteOptions",
-							"description": "The name of the step. Must be \"setSiteOptions\"."
-						},
-						"options": {
-							"type": "object",
-							"additionalProperties": {},
-							"description": "The options to set on the site."
-						}
-					},
-					"required": ["options", "step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "unzip"
-						},
-						"zipFile": {
-							"$ref": "#/definitions/FileReference",
-							"description": "The zip file to extract"
-						},
-						"zipPath": {
-							"type": "string",
-							"description": "The path of the zip file to extract",
-							"deprecated": "Use zipFile instead."
-						},
-						"extractToPath": {
-							"type": "string",
-							"description": "The path to extract the zip file to"
-						}
-					},
-					"required": ["extractToPath", "step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "updateUserMeta"
-						},
-						"meta": {
-							"type": "object",
-							"additionalProperties": {},
-							"description": "An object of user meta values to set, e.g. { \"first_name\": \"John\" }"
-						},
-						"userId": {
-							"type": "number",
-							"description": "User ID"
-						}
-					},
-					"required": ["meta", "step", "userId"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "writeFile"
-						},
-						"path": {
-							"type": "string",
-							"description": "The path of the file to write to"
-						},
-						"data": {
-							"anyOf": [
-								{
-									"$ref": "#/definitions/FileReference"
-								},
-								{
-									"type": "string"
-								},
-								{
-									"type": "object",
-									"properties": {
-										"BYTES_PER_ELEMENT": {
-											"type": "number"
-										},
-										"buffer": {
-											"type": "object",
-											"properties": {
-												"byteLength": {
-													"type": "number"
-												}
-											},
-											"required": ["byteLength"],
-											"additionalProperties": false
-										},
-										"byteLength": {
-											"type": "number"
-										},
-										"byteOffset": {
-											"type": "number"
-										},
-										"length": {
-											"type": "number"
-										}
-									},
-									"required": [
-										"BYTES_PER_ELEMENT",
-										"buffer",
-										"byteLength",
-										"byteOffset",
-										"length"
-									],
-									"additionalProperties": {
-										"type": "number"
-									}
-								}
-							],
-							"description": "The data to write"
-						}
-					},
-					"required": ["data", "path", "step"]
-				},
-				{
-					"type": "object",
-					"additionalProperties": false,
-					"properties": {
-						"progress": {
-							"type": "object",
-							"properties": {
-								"weight": {
-									"type": "number"
-								},
-								"caption": {
-									"type": "string"
-								}
-							},
-							"additionalProperties": false
-						},
-						"step": {
-							"type": "string",
-							"const": "wp-cli",
-							"description": "The step identifier."
-						},
-						"command": {
-							"anyOf": [
-								{
-									"type": "string"
-								},
-								{
-									"type": "array",
-									"items": {
-										"type": "string"
-									}
-								}
-							],
-							"description": "The WP CLI command to run."
-						},
-						"wpCliPath": {
-							"type": "string",
-							"description": "wp-cli.phar path"
-						}
-					},
-					"required": ["command", "step"]
-				}
-			]
-		},
-		"InstallPluginOptions": {
-			"type": "object",
-			"properties": {
-				"activate": {
-					"type": "boolean",
-					"description": "Whether to activate the plugin after installing it."
-				}
-			},
-			"additionalProperties": false
-		},
-		"PHPRequest": {
-			"type": "object",
-			"properties": {
-				"method": {
-					"$ref": "#/definitions/HTTPMethod",
-					"description": "Request method. Default: `GET`."
-				},
-				"url": {
-					"type": "string",
-					"description": "Request path or absolute URL."
-				},
-				"headers": {
-					"$ref": "#/definitions/PHPRequestHeaders",
-					"description": "Request headers."
-				},
-				"files": {
-					"type": "object",
-					"additionalProperties": {
-						"type": "object",
-						"properties": {
-							"size": {
-								"type": "number"
-							},
-							"type": {
-								"type": "string"
-							},
-							"lastModified": {
-								"type": "number"
-							},
-							"name": {
-								"type": "string"
-							},
-							"webkitRelativePath": {
-								"type": "string"
-							}
-						},
-						"required": [
-							"lastModified",
-							"name",
-							"size",
-							"type",
-							"webkitRelativePath"
-						],
-						"additionalProperties": false
-					},
-					"description": "Uploaded files"
-				},
-				"body": {
-					"type": "string",
-					"description": "Request body without the files."
-				},
-				"formData": {
-					"type": "object",
-					"additionalProperties": {},
-					"description": "Form data. If set, the request body will be ignored and the content-type header will be set to `application/x-www-form-urlencoded`."
-				}
-			},
-			"required": ["url"],
-			"additionalProperties": false
-		},
-		"HTTPMethod": {
-			"type": "string",
-			"enum": ["GET", "POST", "HEAD", "OPTIONS", "PATCH", "PUT", "DELETE"]
-		},
-		"PHPRequestHeaders": {
-			"type": "object",
-			"additionalProperties": {
-				"type": "string"
-			}
-		},
-		"PHPRunOptions": {
-			"type": "object",
-			"properties": {
-				"relativeUri": {
-					"type": "string",
-					"description": "Request path following the domain:port part."
-				},
-				"scriptPath": {
-					"type": "string",
-					"description": "Path of the .php file to execute."
-				},
-				"protocol": {
-					"type": "string",
-					"description": "Request protocol."
-				},
-				"method": {
-					"$ref": "#/definitions/HTTPMethod",
-					"description": "Request method. Default: `GET`."
-				},
-				"headers": {
-					"$ref": "#/definitions/PHPRequestHeaders",
-					"description": "Request headers."
-				},
-				"body": {
-					"type": "string",
-					"description": "Request body without the files."
-				},
-				"fileInfos": {
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/FileInfo"
-					},
-					"description": "Uploaded files."
-				},
-				"code": {
-					"type": "string",
-					"description": "The code snippet to eval instead of a php file."
-				},
-				"throwOnError": {
-					"type": "boolean",
-					"description": "Whether to throw an error if the PHP process exits with a non-zero code or outputs to stderr."
-				}
-			},
-			"additionalProperties": false
-		},
-		"FileInfo": {
-			"type": "object",
-			"properties": {
-				"key": {
-					"type": "string"
-				},
-				"name": {
-					"type": "string"
-				},
-				"type": {
-					"type": "string"
-				},
-				"data": {
-					"type": "object",
-					"properties": {
-						"BYTES_PER_ELEMENT": {
-							"type": "number"
-						},
-						"buffer": {
-							"type": "object",
-							"properties": {
-								"byteLength": {
-									"type": "number"
-								}
-							},
-							"required": ["byteLength"],
-							"additionalProperties": false
-						},
-						"byteLength": {
-							"type": "number"
-						},
-						"byteOffset": {
-							"type": "number"
-						},
-						"length": {
-							"type": "number"
-						}
-					},
-					"required": [
-						"BYTES_PER_ELEMENT",
-						"buffer",
-						"byteLength",
-						"byteOffset",
-						"length"
-					],
-					"additionalProperties": {
-						"type": "number"
-					}
-				}
-			},
-			"required": ["key", "name", "type", "data"],
-			"additionalProperties": false
-		},
-		"WordPressInstallationOptions": {
-			"type": "object",
-			"properties": {
-				"adminUsername": {
-					"type": "string"
-				},
-				"adminPassword": {
-					"type": "string"
-				}
-			},
-			"additionalProperties": false
-		}
-	}
-}
+  "$schema": "http://json-schema.org/schema",
+  "$ref": "#/definitions/Blueprint",
+  "definitions": {
+    "Blueprint": {
+      "type": "object",
+      "properties": {
+        "landingPage": {
+          "type": "string",
+          "description": "The URL to navigate to after the blueprint has been run."
+        },
+        "description": {
+          "type": "string",
+          "description": "Optional description. It doesn't do anything but is exposed as a courtesy to developers who may want to document which blueprint file does what."
+        },
+        "preferredVersions": {
+          "type": "object",
+          "properties": {
+            "php": {
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/SupportedPHPVersion"
+                },
+                {
+                  "type": "string",
+                  "const": "latest"
+                }
+              ],
+              "description": "The preferred PHP version to use. If not specified, the latest supported version will be used"
+            },
+            "wp": {
+              "type": "string",
+              "description": "The preferred WordPress version to use. If not specified, the latest supported version will be used"
+            }
+          },
+          "required": [
+            "php",
+            "wp"
+          ],
+          "additionalProperties": false,
+          "description": "The preferred PHP and WordPress versions to use."
+        },
+        "features": {
+          "type": "object",
+          "properties": {
+            "networking": {
+              "type": "boolean",
+              "description": "Should boot with support for network request via wp_safe_remote_get?"
+            }
+          },
+          "additionalProperties": false
+        },
+        "constants": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "description": "PHP Constants to define on every request",
+          "deprecated": "This experimental option will change without warning.\nUse `steps` instead."
+        },
+        "plugins": {
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "type": "string"
+              },
+              {
+                "$ref": "#/definitions/FileReference"
+              }
+            ]
+          },
+          "description": "WordPress plugins to install and activate",
+          "deprecated": "This experimental option will change without warning.\nUse `steps` instead."
+        },
+        "siteOptions": {
+          "type": "object",
+          "additionalProperties": {
+            "type": "string"
+          },
+          "properties": {
+            "blogname": {
+              "type": "string",
+              "description": "The site title"
+            }
+          },
+          "description": "WordPress site options to define",
+          "deprecated": "This experimental option will change without warning.\nUse `steps` instead."
+        },
+        "login": {
+          "anyOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "username": {
+                  "type": "string"
+                },
+                "password": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "username",
+                "password"
+              ],
+              "additionalProperties": false
+            }
+          ],
+          "description": "User to log in as. If true, logs the user in as admin/password."
+        },
+        "phpExtensionBundles": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/SupportedPHPExtensionBundle"
+          },
+          "description": "The PHP extensions to use."
+        },
+        "steps": {
+          "type": "array",
+          "items": {
+            "anyOf": [
+              {
+                "$ref": "#/definitions/StepDefinition"
+              },
+              {
+                "type": "string"
+              },
+              {
+                "not": {}
+              },
+              {
+                "type": "boolean",
+                "const": false
+              },
+              {
+                "type": "null"
+              }
+            ]
+          },
+          "description": "The steps to run after every other operation in this Blueprint was executed."
+        },
+        "$schema": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    },
+    "SupportedPHPVersion": {
+      "type": "string",
+      "enum": [
+        "8.3",
+        "8.2",
+        "8.1",
+        "8.0",
+        "7.4",
+        "7.3",
+        "7.2",
+        "7.1",
+        "7.0"
+      ]
+    },
+    "FileReference": {
+      "anyOf": [
+        {
+          "$ref": "#/definitions/VFSReference"
+        },
+        {
+          "$ref": "#/definitions/LiteralReference"
+        },
+        {
+          "$ref": "#/definitions/CoreThemeReference"
+        },
+        {
+          "$ref": "#/definitions/CorePluginReference"
+        },
+        {
+          "$ref": "#/definitions/UrlReference"
+        }
+      ]
+    },
+    "VFSReference": {
+      "type": "object",
+      "properties": {
+        "resource": {
+          "type": "string",
+          "const": "vfs",
+          "description": "Identifies the file resource as Virtual File System (VFS)"
+        },
+        "path": {
+          "type": "string",
+          "description": "The path to the file in the VFS"
+        }
+      },
+      "required": [
+        "resource",
+        "path"
+      ],
+      "additionalProperties": false
+    },
+    "LiteralReference": {
+      "type": "object",
+      "properties": {
+        "resource": {
+          "type": "string",
+          "const": "literal",
+          "description": "Identifies the file resource as a literal file"
+        },
+        "name": {
+          "type": "string",
+          "description": "The name of the file"
+        },
+        "contents": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "BYTES_PER_ELEMENT": {
+                  "type": "number"
+                },
+                "buffer": {
+                  "type": "object",
+                  "properties": {
+                    "byteLength": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "byteLength"
+                  ],
+                  "additionalProperties": false
+                },
+                "byteLength": {
+                  "type": "number"
+                },
+                "byteOffset": {
+                  "type": "number"
+                },
+                "length": {
+                  "type": "number"
+                }
+              },
+              "required": [
+                "BYTES_PER_ELEMENT",
+                "buffer",
+                "byteLength",
+                "byteOffset",
+                "length"
+              ],
+              "additionalProperties": {
+                "type": "number"
+              }
+            }
+          ],
+          "description": "The contents of the file"
+        }
+      },
+      "required": [
+        "resource",
+        "name",
+        "contents"
+      ],
+      "additionalProperties": false
+    },
+    "CoreThemeReference": {
+      "type": "object",
+      "properties": {
+        "resource": {
+          "type": "string",
+          "const": "wordpress.org/themes",
+          "description": "Identifies the file resource as a WordPress Core theme"
+        },
+        "slug": {
+          "type": "string",
+          "description": "The slug of the WordPress Core theme"
+        }
+      },
+      "required": [
+        "resource",
+        "slug"
+      ],
+      "additionalProperties": false
+    },
+    "CorePluginReference": {
+      "type": "object",
+      "properties": {
+        "resource": {
+          "type": "string",
+          "const": "wordpress.org/plugins",
+          "description": "Identifies the file resource as a WordPress Core plugin"
+        },
+        "slug": {
+          "type": "string",
+          "description": "The slug of the WordPress Core plugin"
+        }
+      },
+      "required": [
+        "resource",
+        "slug"
+      ],
+      "additionalProperties": false
+    },
+    "UrlReference": {
+      "type": "object",
+      "properties": {
+        "resource": {
+          "type": "string",
+          "const": "url",
+          "description": "Identifies the file resource as a URL"
+        },
+        "url": {
+          "type": "string",
+          "description": "The URL of the file"
+        },
+        "caption": {
+          "type": "string",
+          "description": "Optional caption for displaying a progress message"
+        }
+      },
+      "required": [
+        "resource",
+        "url"
+      ],
+      "additionalProperties": false
+    },
+    "SupportedPHPExtensionBundle": {
+      "type": "string",
+      "const": "kitchen-sink"
+    },
+    "StepDefinition": {
+      "type": "object",
+      "discriminator": {
+        "propertyName": "step"
+      },
+      "required": [
+        "step"
+      ],
+      "oneOf": [
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "activatePlugin"
+            },
+            "pluginPath": {
+              "type": "string",
+              "description": "Path to the plugin directory as absolute path (/wordpress/wp-content/plugins/plugin-name); or the plugin entry file relative to the plugins directory (plugin-name/plugin-name.php)."
+            },
+            "pluginName": {
+              "type": "string",
+              "description": "Optional. Plugin name to display in the progress bar."
+            }
+          },
+          "required": [
+            "pluginPath",
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "activateTheme"
+            },
+            "themeFolderName": {
+              "type": "string",
+              "description": "The name of the theme folder inside wp-content/themes/"
+            }
+          },
+          "required": [
+            "step",
+            "themeFolderName"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "cp"
+            },
+            "fromPath": {
+              "type": "string",
+              "description": "Source path"
+            },
+            "toPath": {
+              "type": "string",
+              "description": "Target path"
+            }
+          },
+          "required": [
+            "fromPath",
+            "step",
+            "toPath"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "defineWpConfigConsts"
+            },
+            "consts": {
+              "type": "object",
+              "additionalProperties": {},
+              "description": "The constants to define"
+            },
+            "method": {
+              "type": "string",
+              "enum": [
+                "rewrite-wp-config",
+                "define-before-run"
+              ],
+              "description": "The method of defining the constants. Possible values are:\n\n- rewrite-wp-config: Default. Rewrites the wp-config.php file to                      explicitly call define() with the requested                      name and value. This method alters the file                      on the disk, but it doesn't conflict with                      existing define() calls in wp-config.php.\n- define-before-run: Defines the constant before running the requested                      script. It doesn't alter any files on the disk, but                      constants defined this way may conflict with existing                      define() calls in wp-config.php."
+            },
+            "virtualize": {
+              "type": "boolean",
+              "deprecated": "This option is noop and will be removed in a future version.\nThis option is only kept in here to avoid breaking Blueprint schema validation\nfor existing apps using this option."
+            }
+          },
+          "required": [
+            "consts",
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "defineSiteUrl"
+            },
+            "siteUrl": {
+              "type": "string",
+              "description": "The URL"
+            }
+          },
+          "required": [
+            "siteUrl",
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "enableMultisite"
+            }
+          },
+          "required": [
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "importFile"
+            },
+            "file": {
+              "$ref": "#/definitions/FileReference",
+              "description": "The file to import"
+            }
+          },
+          "required": [
+            "file",
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "importWordPressFiles"
+            },
+            "wordPressFilesZip": {
+              "$ref": "#/definitions/FileReference",
+              "description": "The zip file containing the top-level WordPress files and directories."
+            },
+            "pathInZip": {
+              "type": "string",
+              "description": "The path inside the zip file where the WordPress files are."
+            }
+          },
+          "required": [
+            "step",
+            "wordPressFilesZip"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "installPlugin",
+              "description": "The step identifier."
+            },
+            "pluginZipFile": {
+              "$ref": "#/definitions/FileReference",
+              "description": "The plugin zip file to install."
+            },
+            "options": {
+              "$ref": "#/definitions/InstallPluginOptions",
+              "description": "Optional installation options."
+            }
+          },
+          "required": [
+            "pluginZipFile",
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "installTheme",
+              "description": "The step identifier."
+            },
+            "themeZipFile": {
+              "$ref": "#/definitions/FileReference",
+              "description": "The theme zip file to install."
+            },
+            "options": {
+              "type": "object",
+              "properties": {
+                "activate": {
+                  "type": "boolean",
+                  "description": "Whether to activate the theme after installing it."
+                }
+              },
+              "additionalProperties": false,
+              "description": "Optional installation options."
+            }
+          },
+          "required": [
+            "step",
+            "themeZipFile"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "login"
+            },
+            "username": {
+              "type": "string",
+              "description": "The user to log in as. Defaults to 'admin'."
+            },
+            "password": {
+              "type": "string",
+              "description": "The password to log in with. Defaults to 'password'."
+            }
+          },
+          "required": [
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "mkdir"
+            },
+            "path": {
+              "type": "string",
+              "description": "The path of the directory you want to create"
+            }
+          },
+          "required": [
+            "path",
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "mv"
+            },
+            "fromPath": {
+              "type": "string",
+              "description": "Source path"
+            },
+            "toPath": {
+              "type": "string",
+              "description": "Target path"
+            }
+          },
+          "required": [
+            "fromPath",
+            "step",
+            "toPath"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "request"
+            },
+            "request": {
+              "$ref": "#/definitions/PHPRequest",
+              "description": "Request details (See /wordpress-playground/api/universal/interface/PHPRequest)"
+            }
+          },
+          "required": [
+            "request",
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "rm"
+            },
+            "path": {
+              "type": "string",
+              "description": "The path to remove"
+            }
+          },
+          "required": [
+            "path",
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "rmdir"
+            },
+            "path": {
+              "type": "string",
+              "description": "The path to remove"
+            }
+          },
+          "required": [
+            "path",
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "runPHP",
+              "description": "The step identifier."
+            },
+            "code": {
+              "type": "string",
+              "description": "The PHP code to run."
+            }
+          },
+          "required": [
+            "code",
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "runPHPWithOptions"
+            },
+            "options": {
+              "$ref": "#/definitions/PHPRunOptions",
+              "description": "Run options (See /wordpress-playground/api/universal/interface/PHPRunOptions)"
+            }
+          },
+          "required": [
+            "options",
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "runWpInstallationWizard"
+            },
+            "options": {
+              "$ref": "#/definitions/WordPressInstallationOptions"
+            }
+          },
+          "required": [
+            "options",
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "runSql",
+              "description": "The step identifier."
+            },
+            "sql": {
+              "$ref": "#/definitions/FileReference",
+              "description": "The SQL to run. Each non-empty line must contain a valid SQL query."
+            }
+          },
+          "required": [
+            "sql",
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "setPhpIniEntry"
+            },
+            "key": {
+              "type": "string",
+              "description": "Entry name e.g. \"display_errors\""
+            },
+            "value": {
+              "type": "string",
+              "description": "Entry value as a string e.g. \"1\""
+            }
+          },
+          "required": [
+            "key",
+            "step",
+            "value"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "setSiteOptions",
+              "description": "The name of the step. Must be \"setSiteOptions\"."
+            },
+            "options": {
+              "type": "object",
+              "additionalProperties": {},
+              "description": "The options to set on the site."
+            }
+          },
+          "required": [
+            "options",
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "unzip"
+            },
+            "zipFile": {
+              "$ref": "#/definitions/FileReference",
+              "description": "The zip file to extract"
+            },
+            "zipPath": {
+              "type": "string",
+              "description": "The path of the zip file to extract",
+              "deprecated": "Use zipFile instead."
+            },
+            "extractToPath": {
+              "type": "string",
+              "description": "The path to extract the zip file to"
+            }
+          },
+          "required": [
+            "extractToPath",
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "updateUserMeta"
+            },
+            "meta": {
+              "type": "object",
+              "additionalProperties": {},
+              "description": "An object of user meta values to set, e.g. { \"first_name\": \"John\" }"
+            },
+            "userId": {
+              "type": "number",
+              "description": "User ID"
+            }
+          },
+          "required": [
+            "meta",
+            "step",
+            "userId"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "writeFile"
+            },
+            "path": {
+              "type": "string",
+              "description": "The path of the file to write to"
+            },
+            "data": {
+              "anyOf": [
+                {
+                  "$ref": "#/definitions/FileReference"
+                },
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "BYTES_PER_ELEMENT": {
+                      "type": "number"
+                    },
+                    "buffer": {
+                      "type": "object",
+                      "properties": {
+                        "byteLength": {
+                          "type": "number"
+                        }
+                      },
+                      "required": [
+                        "byteLength"
+                      ],
+                      "additionalProperties": false
+                    },
+                    "byteLength": {
+                      "type": "number"
+                    },
+                    "byteOffset": {
+                      "type": "number"
+                    },
+                    "length": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "BYTES_PER_ELEMENT",
+                    "buffer",
+                    "byteLength",
+                    "byteOffset",
+                    "length"
+                  ],
+                  "additionalProperties": {
+                    "type": "number"
+                  }
+                }
+              ],
+              "description": "The data to write"
+            }
+          },
+          "required": [
+            "data",
+            "path",
+            "step"
+          ]
+        },
+        {
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "progress": {
+              "type": "object",
+              "properties": {
+                "weight": {
+                  "type": "number"
+                },
+                "caption": {
+                  "type": "string"
+                }
+              },
+              "additionalProperties": false
+            },
+            "step": {
+              "type": "string",
+              "const": "wp-cli",
+              "description": "The step identifier."
+            },
+            "command": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              ],
+              "description": "The WP CLI command to run."
+            },
+            "wpCliPath": {
+              "type": "string",
+              "description": "wp-cli.phar path"
+            }
+          },
+          "required": [
+            "command",
+            "step"
+          ]
+        }
+      ]
+    },
+    "InstallPluginOptions": {
+      "type": "object",
+      "properties": {
+        "activate": {
+          "type": "boolean",
+          "description": "Whether to activate the plugin after installing it."
+        }
+      },
+      "additionalProperties": false
+    },
+    "PHPRequest": {
+      "type": "object",
+      "properties": {
+        "method": {
+          "$ref": "#/definitions/HTTPMethod",
+          "description": "Request method. Default: `GET`."
+        },
+        "url": {
+          "type": "string",
+          "description": "Request path or absolute URL."
+        },
+        "headers": {
+          "$ref": "#/definitions/PHPRequestHeaders",
+          "description": "Request headers."
+        },
+        "body": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "BYTES_PER_ELEMENT": {
+                  "type": "number"
+                },
+                "buffer": {
+                  "type": "object",
+                  "properties": {
+                    "byteLength": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "byteLength"
+                  ],
+                  "additionalProperties": false
+                },
+                "byteLength": {
+                  "type": "number"
+                },
+                "byteOffset": {
+                  "type": "number"
+                },
+                "length": {
+                  "type": "number"
+                }
+              },
+              "required": [
+                "BYTES_PER_ELEMENT",
+                "buffer",
+                "byteLength",
+                "byteOffset",
+                "length"
+              ],
+              "additionalProperties": {
+                "type": "number"
+              }
+            },
+            {
+              "type": "object",
+              "additionalProperties": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "object",
+                    "properties": {
+                      "BYTES_PER_ELEMENT": {
+                        "type": "number"
+                      },
+                      "buffer": {
+                        "type": "object",
+                        "properties": {
+                          "byteLength": {
+                            "type": "number"
+                          }
+                        },
+                        "required": [
+                          "byteLength"
+                        ],
+                        "additionalProperties": false
+                      },
+                      "byteLength": {
+                        "type": "number"
+                      },
+                      "byteOffset": {
+                        "type": "number"
+                      },
+                      "length": {
+                        "type": "number"
+                      }
+                    },
+                    "required": [
+                      "BYTES_PER_ELEMENT",
+                      "buffer",
+                      "byteLength",
+                      "byteOffset",
+                      "length"
+                    ],
+                    "additionalProperties": {
+                      "type": "number"
+                    }
+                  },
+                  {
+                    "type": "object",
+                    "properties": {
+                      "size": {
+                        "type": "number"
+                      },
+                      "type": {
+                        "type": "string"
+                      },
+                      "lastModified": {
+                        "type": "number"
+                      },
+                      "name": {
+                        "type": "string"
+                      },
+                      "webkitRelativePath": {
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "lastModified",
+                      "name",
+                      "size",
+                      "type",
+                      "webkitRelativePath"
+                    ],
+                    "additionalProperties": false
+                  }
+                ]
+              }
+            }
+          ],
+          "description": "Request body. If an object is given, the request will be encoded as multipart and sent with a `multipart/form-data` header."
+        }
+      },
+      "required": [
+        "url"
+      ],
+      "additionalProperties": false
+    },
+    "HTTPMethod": {
+      "type": "string",
+      "enum": [
+        "GET",
+        "POST",
+        "HEAD",
+        "OPTIONS",
+        "PATCH",
+        "PUT",
+        "DELETE"
+      ]
+    },
+    "PHPRequestHeaders": {
+      "type": "object",
+      "additionalProperties": {
+        "type": "string"
+      }
+    },
+    "PHPRunOptions": {
+      "type": "object",
+      "properties": {
+        "relativeUri": {
+          "type": "string",
+          "description": "Request path following the domain:port part."
+        },
+        "scriptPath": {
+          "type": "string",
+          "description": "Path of the .php file to execute."
+        },
+        "protocol": {
+          "type": "string",
+          "description": "Request protocol."
+        },
+        "method": {
+          "$ref": "#/definitions/HTTPMethod",
+          "description": "Request method. Default: `GET`."
+        },
+        "headers": {
+          "$ref": "#/definitions/PHPRequestHeaders",
+          "description": "Request headers."
+        },
+        "body": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "object",
+              "properties": {
+                "BYTES_PER_ELEMENT": {
+                  "type": "number"
+                },
+                "buffer": {
+                  "type": "object",
+                  "properties": {
+                    "byteLength": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "byteLength"
+                  ],
+                  "additionalProperties": false
+                },
+                "byteLength": {
+                  "type": "number"
+                },
+                "byteOffset": {
+                  "type": "number"
+                },
+                "length": {
+                  "type": "number"
+                }
+              },
+              "required": [
+                "BYTES_PER_ELEMENT",
+                "buffer",
+                "byteLength",
+                "byteOffset",
+                "length"
+              ],
+              "additionalProperties": {
+                "type": "number"
+              }
+            }
+          ],
+          "description": "Request body."
+        },
+        "code": {
+          "type": "string",
+          "description": "The code snippet to eval instead of a php file."
+        },
+        "throwOnError": {
+          "type": "boolean",
+          "description": "Whether to throw an error if the PHP process exits with a non-zero code or outputs to stderr."
+        }
+      },
+      "additionalProperties": false
+    },
+    "WordPressInstallationOptions": {
+      "type": "object",
+      "properties": {
+        "adminUsername": {
+          "type": "string"
+        },
+        "adminPassword": {
+          "type": "string"
+        }
+      },
+      "additionalProperties": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/packages/playground/blueprints/src/lib/compile.ts b/packages/playground/blueprints/src/lib/compile.ts
index d447aae1eb..4fc6adafa6 100644
--- a/packages/playground/blueprints/src/lib/compile.ts
+++ b/packages/playground/blueprints/src/lib/compile.ts
@@ -13,7 +13,8 @@ import type { SupportedPHPExtensionBundle } from '@php-wasm/universal';
 import { FileReference, isFileReference, Resource } from './resources';
 import { Step, StepDefinition } from './steps';
 import * as allStepHandlers from './steps/handlers';
-import { Blueprint } from './blueprint';
+import { Blueprint } from './blueprint'
+import { get_logger } from '../../../website/src/lib/logger';
 
 // @TODO: Configure this in the `wp-cli` step, not here.
 const { wpCLI, ...otherStepHandlers } = allStepHandlers;
@@ -237,9 +238,10 @@ export function compileBlueprint(
 						onStepCompleted(result, step);
 					} catch (e) {
 						console.error(e);
-						// @TODO This should return logs from the PHP process
-						let message = await playground.getRequestPhpErrorLog();
-						message += `\n Error when executing the blueprint step #${i} (${JSON.stringify(
+						get_logger().logRaw(
+							await playground.getRequestPhpErrorLog()
+						);
+						let message = `Error when executing the blueprint step #${i} (${JSON.stringify(
 							step
 						)})`;
 						message += e instanceof Error ? `: ${e.message}` : e;
diff --git a/packages/playground/website/src/lib/logger.ts b/packages/playground/website/src/lib/logger.ts
index f344657b69..042de9566d 100644
--- a/packages/playground/website/src/lib/logger.ts
+++ b/packages/playground/website/src/lib/logger.ts
@@ -1,6 +1,3 @@
-import { BasePHP } from "@php-wasm/universal/src/lib/base-php";
-import { UniversalPHP } from "@php-wasm/universal/src/lib/universal-php";
-
 export enum LogSeverity {
     // A debugging event.
     Debug,
@@ -21,6 +18,9 @@ export class Logger {
         this.collectPlaygroundLogs();
     }
 
+    /**
+     * Collect errors from Playground and log them.
+     */
     private collectPlaygroundLogs() {
          if (typeof window !== 'undefined') {
             window.addEventListener('error', (event) => {
@@ -56,22 +56,48 @@ export class Logger {
         return `${day}-${month}-${year} ${hours}:${minutes}:${seconds} UTC`;
     }
 
+    /**
+     * Format log message and severity and log it.
+     * @param string message
+     * @param LogSeverity severity
+     */
+    public formatLog(message: string, severity: LogSeverity): string {
+        const now = this.formatLogDate(new Date());
+        return `[${now}] ${this.LOG_PREFIX} ${LogSeverity[severity]}: ${message}`;
+    }
+
+    /**
+     * Log message with severity and timestamp.
+     * @param string message
+     * @param LogSeverity severity
+     */
     public log(message: string, severity?: LogSeverity): void {
         if (severity === undefined) {
             severity = LogSeverity.Info;
         }
-        const now = this.formatLogDate(new Date());
-        const log = `[${now}] ${this.LOG_PREFIX} ${LogSeverity[severity]}: ${message}`;
+        const log = this.formatLog(message, severity);
         this.logRaw(log);
     }
 
+    /**
+     * Log message without severity and timestamp.
+     * @param string log
+     */
     public logRaw(log: string): void {
         console.debug(log);
     }
 };
 
+/**
+ * The logger instance.
+ */
 let logger: Logger | undefined = undefined;
 
+/**
+ * Get the logger instance.
+ *
+ * @returns Logger
+ */
 export function get_logger(): Logger {
     if (!logger) {
         logger = new Logger();

From 42e47d87725b8ee1b96960298eb18d5ed2bee518 Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Mon, 19 Feb 2024 09:36:22 +0100
Subject: [PATCH 12/30] Move logger to blueprints

---
 .../playground/blueprints/src/lib/compile.ts  | 14 ++++------
 .../src/lib/utils}/logger.ts                  | 28 +++++++++++++++++++
 packages/playground/website/src/lib/hooks.ts  | 13 +--------
 packages/playground/website/tsconfig.app.json |  4 ++-
 4 files changed, 38 insertions(+), 21 deletions(-)
 rename packages/playground/{website/src/lib => blueprints/src/lib/utils}/logger.ts (77%)

diff --git a/packages/playground/blueprints/src/lib/compile.ts b/packages/playground/blueprints/src/lib/compile.ts
index 4fc6adafa6..5b7c37a431 100644
--- a/packages/playground/blueprints/src/lib/compile.ts
+++ b/packages/playground/blueprints/src/lib/compile.ts
@@ -14,7 +14,7 @@ import { FileReference, isFileReference, Resource } from './resources';
 import { Step, StepDefinition } from './steps';
 import * as allStepHandlers from './steps/handlers';
 import { Blueprint } from './blueprint'
-import { get_logger } from '../../../website/src/lib/logger';
+import { get_logger } from './utils/logger';
 
 // @TODO: Configure this in the `wp-cli` step, not here.
 const { wpCLI, ...otherStepHandlers } = allStepHandlers;
@@ -221,6 +221,9 @@ export function compileBlueprint(
 			networking: blueprint.features?.networking ?? false,
 		},
 		run: async (playground: UniversalPHP) => {
+			// Initialize logger
+			const logger = get_logger();
+			logger.addPlaygroundRequestEndListener(playground);
 			try {
 				// Start resolving resources early
 				for (const { resources } of compiled) {
@@ -238,14 +241,9 @@ export function compileBlueprint(
 						onStepCompleted(result, step);
 					} catch (e) {
 						console.error(e);
-						get_logger().logRaw(
-							await playground.getRequestPhpErrorLog()
-						);
-						let message = `Error when executing the blueprint step #${i} (${JSON.stringify(
+						throw new Error(`Error when executing the blueprint step #${i} (${JSON.stringify(
 							step
-						)})`;
-						message += e instanceof Error ? `: ${e.message}` : e;
-						throw new Error(message);
+						)}) ${e instanceof Error ? `: ${e.message}` : e}`);
 					}
 				}
 			} finally {
diff --git a/packages/playground/website/src/lib/logger.ts b/packages/playground/blueprints/src/lib/utils/logger.ts
similarity index 77%
rename from packages/playground/website/src/lib/logger.ts
rename to packages/playground/blueprints/src/lib/utils/logger.ts
index 042de9566d..283eed45b2 100644
--- a/packages/playground/website/src/lib/logger.ts
+++ b/packages/playground/blueprints/src/lib/utils/logger.ts
@@ -1,3 +1,9 @@
+import { PHPRequestEndEvent } from "@php-wasm/universal/src/lib/universal-php";
+import { UniversalPHP } from "../../../../client/src";
+
+/**
+ * Log severity levels.
+ */
 export enum LogSeverity {
     // A debugging event.
     Debug,
@@ -11,6 +17,9 @@ export enum LogSeverity {
     Fatal,
 }
 
+/**
+ * A logger for Playground.
+ */
 export class Logger {
     private readonly LOG_PREFIX = 'Playground';
 
@@ -35,9 +44,28 @@ export class Logger {
                     LogSeverity.Fatal
                 );
             });
+            window.addEventListener('rejectionhandled', (event) => {
+                this.log(
+                    `${event.reason.stack}`,
+                    LogSeverity.Fatal
+                );
+            });
         }
     }
 
+    /**
+     * Register a listener for the request.end event and log the data.
+     * @param UniversalPHP playground instance
+     */
+    public addPlaygroundRequestEndListener(playground: UniversalPHP) {
+        playground.addEventListener('request.end', (event) => {
+            event = event as PHPRequestEndEvent;
+            if (event.data && event.data['log']) {
+                this.logRaw(event?.data['log']);
+            }
+        } );
+    }
+
     /**
      * Get UTC date in the PHP log format https://github.com/php/php-src/blob/master/main/main.c#L849
      *
diff --git a/packages/playground/website/src/lib/hooks.ts b/packages/playground/website/src/lib/hooks.ts
index 15d9b52f61..18c448ac9f 100644
--- a/packages/playground/website/src/lib/hooks.ts
+++ b/packages/playground/website/src/lib/hooks.ts
@@ -2,8 +2,6 @@ import { useEffect, useRef, useState } from 'react';
 import { Blueprint, startPlaygroundWeb } from '@wp-playground/client';
 import type { PlaygroundClient } from '@wp-playground/client';
 import { getRemoteUrl } from './config';
-import { LogSeverity, get_logger } from './logger';
-import { PHPRequestEndEvent } from '@php-wasm/universal/src/lib/universal-php';
 
 interface UsePlaygroundOptions {
 	blueprint?: Blueprint;
@@ -36,23 +34,14 @@ export function usePlayground({ blueprint, storage }: UsePlaygroundOptions) {
 			remoteUrl.searchParams.set('storage', storage);
 		}
 
-		const logger = get_logger();
 		startPlaygroundWeb({
 			iframe,
 			remoteUrl: remoteUrl.toString(),
 			blueprint,
 		}).then(async (playground) => {
 			playground.onNavigation((url) => setUrl(url));
-			playground.addEventListener('request.end', (event) => {
-				event = event as PHPRequestEndEvent;
-				if (event.data && event.data.log) {
-					logger.logRaw(event?.data.log);
-				}
-			} );
 			setPlayground(() => playground);
-		}).catch((error) => {
-			logger.log(error, LogSeverity.Fatal);
-		} );
+		});
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [iframe, awaitedIframe]);
 
diff --git a/packages/playground/website/tsconfig.app.json b/packages/playground/website/tsconfig.app.json
index 9b9b776920..5e4d52ce73 100644
--- a/packages/playground/website/tsconfig.app.json
+++ b/packages/playground/website/tsconfig.app.json
@@ -30,5 +30,7 @@
 		"demos/terminal.ts",
 		"demos/terminal-component.tsx",
 		"./cypress.config.ts"
-	]
+,
+"../blueprints/src/lib/utils/logger.ts"
+]
 }

From 3ea93c57ce6e427c3632bc9886dc4e64c02ca697 Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Mon, 19 Feb 2024 09:50:01 +0100
Subject: [PATCH 13/30] Remove unused dependency

---
 packages/playground/website/tsconfig.app.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/playground/website/tsconfig.app.json b/packages/playground/website/tsconfig.app.json
index 5e4d52ce73..e0654f6947 100644
--- a/packages/playground/website/tsconfig.app.json
+++ b/packages/playground/website/tsconfig.app.json
@@ -30,7 +30,5 @@
 		"demos/terminal.ts",
 		"demos/terminal-component.tsx",
 		"./cypress.config.ts"
-,
-"../blueprints/src/lib/utils/logger.ts"
 ]
 }

From b1b1c71124d143af3dfbf28b3ed6ee0214cc9c80 Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Mon, 19 Feb 2024 09:58:20 +0100
Subject: [PATCH 14/30] Fix linter error

---
 packages/playground/blueprints/src/lib/utils/logger.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/playground/blueprints/src/lib/utils/logger.ts b/packages/playground/blueprints/src/lib/utils/logger.ts
index 283eed45b2..5ca19550ad 100644
--- a/packages/playground/blueprints/src/lib/utils/logger.ts
+++ b/packages/playground/blueprints/src/lib/utils/logger.ts
@@ -1,6 +1,5 @@
 import { PHPRequestEndEvent } from "@php-wasm/universal/src/lib/universal-php";
-import { UniversalPHP } from "../../../../client/src";
-
+import { UniversalPHP } from "@php-wasm/universal/src/lib/universal-php";
 /**
  * Log severity levels.
  */

From c3e2c77f0d2548a0e9b761c012e6ef0af794f464 Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Mon, 19 Feb 2024 10:51:45 +0100
Subject: [PATCH 15/30] Move logger length to Logger

---
 packages/php-wasm/universal/src/lib/base-php.ts    | 14 ++------------
 .../php-wasm/universal/src/lib/universal-php.ts    |  7 +------
 packages/php-wasm/web/src/lib/web-php-endpoint.ts  |  5 -----
 .../playground/blueprints/src/lib/utils/logger.ts  |  9 ++++++++-
 4 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/packages/php-wasm/universal/src/lib/base-php.ts b/packages/php-wasm/universal/src/lib/base-php.ts
index bd4e914cd1..ef5b9bb8e0 100644
--- a/packages/php-wasm/universal/src/lib/base-php.ts
+++ b/packages/php-wasm/universal/src/lib/base-php.ts
@@ -53,9 +53,6 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 	#messageListeners: MessageListener[] = [];
 	requestHandler?: PHPBrowser;
 
-	// The pointer in the PHP log file where the last request ended.
-	logStartPosition = 0;
-
 	/**
 	 * An exclusive lock that prevent multiple requests from running at
 	 * the same time.
@@ -82,9 +79,6 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 				new PHPRequestHandler(this, serverOptions)
 			);
 		}
-
-		// Use the log length as the start position for the current request.
-		this.logStartPosition = this.getPhpErrorLog().length;
 	}
 
 	addEventListener(eventType: PHPEvent['type'], listener: PHPEventListener) {
@@ -240,7 +234,8 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 		return this.requestHandler.request(request, maxRedirects);
 	}
 
-	getPhpErrorLog() {
+	/** @inheritDoc */
+	getRequestPhpErrorLog() {
 		const logPath = '/wordpress/wp-content/debug.log';
 		if (!this.fileExists(logPath)) {
 			return '';
@@ -248,11 +243,6 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 		return this.readFileAsText(logPath);
 	}
 
-	/** @inheritDoc */
-	getRequestPhpErrorLog() {
-		return this.getPhpErrorLog().substring(this.logStartPosition);
-	}
-
 	/** @inheritDoc */
 	async run(request: PHPRunOptions): Promise<PHPResponse> {
 		/*
diff --git a/packages/php-wasm/universal/src/lib/universal-php.ts b/packages/php-wasm/universal/src/lib/universal-php.ts
index f98d3ce5cb..aa4e5ad912 100644
--- a/packages/php-wasm/universal/src/lib/universal-php.ts
+++ b/packages/php-wasm/universal/src/lib/universal-php.ts
@@ -324,12 +324,7 @@ export interface IsomorphicLocalPHP extends RequestHandler {
 	chdir(path: string): void;
 
 	/**
-	 * Get all PHP error log data.
-	*/
-	getPhpErrorLog(): string;
-
-	/**
-	 * Get PHP error log data for the current request.
+	 * Get PHP error log data.
 	 */
 	getRequestPhpErrorLog(): string;
 
diff --git a/packages/php-wasm/web/src/lib/web-php-endpoint.ts b/packages/php-wasm/web/src/lib/web-php-endpoint.ts
index 76e12bc42b..cec7db9fb6 100644
--- a/packages/php-wasm/web/src/lib/web-php-endpoint.ts
+++ b/packages/php-wasm/web/src/lib/web-php-endpoint.ts
@@ -99,11 +99,6 @@ export class WebPHPEndpoint implements IsomorphicLocalPHP {
 		return _private.get(this)!.php.request(request, redirects);
 	}
 
-	/** @inheritDoc @php-wasm/universal!RequestHandler.getPhpErrorLog */
-	getPhpErrorLog() {
-		return _private.get(this)!.php.getPhpErrorLog();
-	}
-
 	/** @inheritDoc @php-wasm/universal!RequestHandler.getRequestPhpErrorLog */
 	getRequestPhpErrorLog() {
 		return _private.get(this)!.php.getRequestPhpErrorLog();
diff --git a/packages/playground/blueprints/src/lib/utils/logger.ts b/packages/playground/blueprints/src/lib/utils/logger.ts
index 5ca19550ad..4d450a1fae 100644
--- a/packages/playground/blueprints/src/lib/utils/logger.ts
+++ b/packages/playground/blueprints/src/lib/utils/logger.ts
@@ -22,6 +22,11 @@ export enum LogSeverity {
 export class Logger {
     private readonly LOG_PREFIX = 'Playground';
 
+    /**
+     * The length of the last PHP log.
+     */
+    private lastPHPLogLength = 0;
+
     constructor() {
         this.collectPlaygroundLogs();
     }
@@ -60,11 +65,13 @@ export class Logger {
         playground.addEventListener('request.end', (event) => {
             event = event as PHPRequestEndEvent;
             if (event.data && event.data['log']) {
-                this.logRaw(event?.data['log']);
+                this.logRaw(event?.data['log'].substring(this.lastPHPLogLength));
+                this.lastPHPLogLength = event.data['log'].length;
             }
         } );
     }
 
+
     /**
      * Get UTC date in the PHP log format https://github.com/php/php-src/blob/master/main/main.c#L849
      *

From 9eed92facaf48545bfe31319edeb3da459bec0f8 Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Mon, 19 Feb 2024 13:39:43 +0100
Subject: [PATCH 16/30] Cleanup unused changes

---
 .../blueprints/public/blueprint-schema.json   | 2866 ++++++++---------
 packages/playground/website/tsconfig.app.json |    2 +-
 2 files changed, 1340 insertions(+), 1528 deletions(-)

diff --git a/packages/playground/blueprints/public/blueprint-schema.json b/packages/playground/blueprints/public/blueprint-schema.json
index ffe284d680..4c6a1405c3 100644
--- a/packages/playground/blueprints/public/blueprint-schema.json
+++ b/packages/playground/blueprints/public/blueprint-schema.json
@@ -1,1528 +1,1340 @@
 {
-  "$schema": "http://json-schema.org/schema",
-  "$ref": "#/definitions/Blueprint",
-  "definitions": {
-    "Blueprint": {
-      "type": "object",
-      "properties": {
-        "landingPage": {
-          "type": "string",
-          "description": "The URL to navigate to after the blueprint has been run."
-        },
-        "description": {
-          "type": "string",
-          "description": "Optional description. It doesn't do anything but is exposed as a courtesy to developers who may want to document which blueprint file does what."
-        },
-        "preferredVersions": {
-          "type": "object",
-          "properties": {
-            "php": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/SupportedPHPVersion"
-                },
-                {
-                  "type": "string",
-                  "const": "latest"
-                }
-              ],
-              "description": "The preferred PHP version to use. If not specified, the latest supported version will be used"
-            },
-            "wp": {
-              "type": "string",
-              "description": "The preferred WordPress version to use. If not specified, the latest supported version will be used"
-            }
-          },
-          "required": [
-            "php",
-            "wp"
-          ],
-          "additionalProperties": false,
-          "description": "The preferred PHP and WordPress versions to use."
-        },
-        "features": {
-          "type": "object",
-          "properties": {
-            "networking": {
-              "type": "boolean",
-              "description": "Should boot with support for network request via wp_safe_remote_get?"
-            }
-          },
-          "additionalProperties": false
-        },
-        "constants": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          },
-          "description": "PHP Constants to define on every request",
-          "deprecated": "This experimental option will change without warning.\nUse `steps` instead."
-        },
-        "plugins": {
-          "type": "array",
-          "items": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "$ref": "#/definitions/FileReference"
-              }
-            ]
-          },
-          "description": "WordPress plugins to install and activate",
-          "deprecated": "This experimental option will change without warning.\nUse `steps` instead."
-        },
-        "siteOptions": {
-          "type": "object",
-          "additionalProperties": {
-            "type": "string"
-          },
-          "properties": {
-            "blogname": {
-              "type": "string",
-              "description": "The site title"
-            }
-          },
-          "description": "WordPress site options to define",
-          "deprecated": "This experimental option will change without warning.\nUse `steps` instead."
-        },
-        "login": {
-          "anyOf": [
-            {
-              "type": "boolean"
-            },
-            {
-              "type": "object",
-              "properties": {
-                "username": {
-                  "type": "string"
-                },
-                "password": {
-                  "type": "string"
-                }
-              },
-              "required": [
-                "username",
-                "password"
-              ],
-              "additionalProperties": false
-            }
-          ],
-          "description": "User to log in as. If true, logs the user in as admin/password."
-        },
-        "phpExtensionBundles": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/SupportedPHPExtensionBundle"
-          },
-          "description": "The PHP extensions to use."
-        },
-        "steps": {
-          "type": "array",
-          "items": {
-            "anyOf": [
-              {
-                "$ref": "#/definitions/StepDefinition"
-              },
-              {
-                "type": "string"
-              },
-              {
-                "not": {}
-              },
-              {
-                "type": "boolean",
-                "const": false
-              },
-              {
-                "type": "null"
-              }
-            ]
-          },
-          "description": "The steps to run after every other operation in this Blueprint was executed."
-        },
-        "$schema": {
-          "type": "string"
-        }
-      },
-      "additionalProperties": false
-    },
-    "SupportedPHPVersion": {
-      "type": "string",
-      "enum": [
-        "8.3",
-        "8.2",
-        "8.1",
-        "8.0",
-        "7.4",
-        "7.3",
-        "7.2",
-        "7.1",
-        "7.0"
-      ]
-    },
-    "FileReference": {
-      "anyOf": [
-        {
-          "$ref": "#/definitions/VFSReference"
-        },
-        {
-          "$ref": "#/definitions/LiteralReference"
-        },
-        {
-          "$ref": "#/definitions/CoreThemeReference"
-        },
-        {
-          "$ref": "#/definitions/CorePluginReference"
-        },
-        {
-          "$ref": "#/definitions/UrlReference"
-        }
-      ]
-    },
-    "VFSReference": {
-      "type": "object",
-      "properties": {
-        "resource": {
-          "type": "string",
-          "const": "vfs",
-          "description": "Identifies the file resource as Virtual File System (VFS)"
-        },
-        "path": {
-          "type": "string",
-          "description": "The path to the file in the VFS"
-        }
-      },
-      "required": [
-        "resource",
-        "path"
-      ],
-      "additionalProperties": false
-    },
-    "LiteralReference": {
-      "type": "object",
-      "properties": {
-        "resource": {
-          "type": "string",
-          "const": "literal",
-          "description": "Identifies the file resource as a literal file"
-        },
-        "name": {
-          "type": "string",
-          "description": "The name of the file"
-        },
-        "contents": {
-          "anyOf": [
-            {
-              "type": "string"
-            },
-            {
-              "type": "object",
-              "properties": {
-                "BYTES_PER_ELEMENT": {
-                  "type": "number"
-                },
-                "buffer": {
-                  "type": "object",
-                  "properties": {
-                    "byteLength": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "byteLength"
-                  ],
-                  "additionalProperties": false
-                },
-                "byteLength": {
-                  "type": "number"
-                },
-                "byteOffset": {
-                  "type": "number"
-                },
-                "length": {
-                  "type": "number"
-                }
-              },
-              "required": [
-                "BYTES_PER_ELEMENT",
-                "buffer",
-                "byteLength",
-                "byteOffset",
-                "length"
-              ],
-              "additionalProperties": {
-                "type": "number"
-              }
-            }
-          ],
-          "description": "The contents of the file"
-        }
-      },
-      "required": [
-        "resource",
-        "name",
-        "contents"
-      ],
-      "additionalProperties": false
-    },
-    "CoreThemeReference": {
-      "type": "object",
-      "properties": {
-        "resource": {
-          "type": "string",
-          "const": "wordpress.org/themes",
-          "description": "Identifies the file resource as a WordPress Core theme"
-        },
-        "slug": {
-          "type": "string",
-          "description": "The slug of the WordPress Core theme"
-        }
-      },
-      "required": [
-        "resource",
-        "slug"
-      ],
-      "additionalProperties": false
-    },
-    "CorePluginReference": {
-      "type": "object",
-      "properties": {
-        "resource": {
-          "type": "string",
-          "const": "wordpress.org/plugins",
-          "description": "Identifies the file resource as a WordPress Core plugin"
-        },
-        "slug": {
-          "type": "string",
-          "description": "The slug of the WordPress Core plugin"
-        }
-      },
-      "required": [
-        "resource",
-        "slug"
-      ],
-      "additionalProperties": false
-    },
-    "UrlReference": {
-      "type": "object",
-      "properties": {
-        "resource": {
-          "type": "string",
-          "const": "url",
-          "description": "Identifies the file resource as a URL"
-        },
-        "url": {
-          "type": "string",
-          "description": "The URL of the file"
-        },
-        "caption": {
-          "type": "string",
-          "description": "Optional caption for displaying a progress message"
-        }
-      },
-      "required": [
-        "resource",
-        "url"
-      ],
-      "additionalProperties": false
-    },
-    "SupportedPHPExtensionBundle": {
-      "type": "string",
-      "const": "kitchen-sink"
-    },
-    "StepDefinition": {
-      "type": "object",
-      "discriminator": {
-        "propertyName": "step"
-      },
-      "required": [
-        "step"
-      ],
-      "oneOf": [
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "activatePlugin"
-            },
-            "pluginPath": {
-              "type": "string",
-              "description": "Path to the plugin directory as absolute path (/wordpress/wp-content/plugins/plugin-name); or the plugin entry file relative to the plugins directory (plugin-name/plugin-name.php)."
-            },
-            "pluginName": {
-              "type": "string",
-              "description": "Optional. Plugin name to display in the progress bar."
-            }
-          },
-          "required": [
-            "pluginPath",
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "activateTheme"
-            },
-            "themeFolderName": {
-              "type": "string",
-              "description": "The name of the theme folder inside wp-content/themes/"
-            }
-          },
-          "required": [
-            "step",
-            "themeFolderName"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "cp"
-            },
-            "fromPath": {
-              "type": "string",
-              "description": "Source path"
-            },
-            "toPath": {
-              "type": "string",
-              "description": "Target path"
-            }
-          },
-          "required": [
-            "fromPath",
-            "step",
-            "toPath"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "defineWpConfigConsts"
-            },
-            "consts": {
-              "type": "object",
-              "additionalProperties": {},
-              "description": "The constants to define"
-            },
-            "method": {
-              "type": "string",
-              "enum": [
-                "rewrite-wp-config",
-                "define-before-run"
-              ],
-              "description": "The method of defining the constants. Possible values are:\n\n- rewrite-wp-config: Default. Rewrites the wp-config.php file to                      explicitly call define() with the requested                      name and value. This method alters the file                      on the disk, but it doesn't conflict with                      existing define() calls in wp-config.php.\n- define-before-run: Defines the constant before running the requested                      script. It doesn't alter any files on the disk, but                      constants defined this way may conflict with existing                      define() calls in wp-config.php."
-            },
-            "virtualize": {
-              "type": "boolean",
-              "deprecated": "This option is noop and will be removed in a future version.\nThis option is only kept in here to avoid breaking Blueprint schema validation\nfor existing apps using this option."
-            }
-          },
-          "required": [
-            "consts",
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "defineSiteUrl"
-            },
-            "siteUrl": {
-              "type": "string",
-              "description": "The URL"
-            }
-          },
-          "required": [
-            "siteUrl",
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "enableMultisite"
-            }
-          },
-          "required": [
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "importFile"
-            },
-            "file": {
-              "$ref": "#/definitions/FileReference",
-              "description": "The file to import"
-            }
-          },
-          "required": [
-            "file",
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "importWordPressFiles"
-            },
-            "wordPressFilesZip": {
-              "$ref": "#/definitions/FileReference",
-              "description": "The zip file containing the top-level WordPress files and directories."
-            },
-            "pathInZip": {
-              "type": "string",
-              "description": "The path inside the zip file where the WordPress files are."
-            }
-          },
-          "required": [
-            "step",
-            "wordPressFilesZip"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "installPlugin",
-              "description": "The step identifier."
-            },
-            "pluginZipFile": {
-              "$ref": "#/definitions/FileReference",
-              "description": "The plugin zip file to install."
-            },
-            "options": {
-              "$ref": "#/definitions/InstallPluginOptions",
-              "description": "Optional installation options."
-            }
-          },
-          "required": [
-            "pluginZipFile",
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "installTheme",
-              "description": "The step identifier."
-            },
-            "themeZipFile": {
-              "$ref": "#/definitions/FileReference",
-              "description": "The theme zip file to install."
-            },
-            "options": {
-              "type": "object",
-              "properties": {
-                "activate": {
-                  "type": "boolean",
-                  "description": "Whether to activate the theme after installing it."
-                }
-              },
-              "additionalProperties": false,
-              "description": "Optional installation options."
-            }
-          },
-          "required": [
-            "step",
-            "themeZipFile"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "login"
-            },
-            "username": {
-              "type": "string",
-              "description": "The user to log in as. Defaults to 'admin'."
-            },
-            "password": {
-              "type": "string",
-              "description": "The password to log in with. Defaults to 'password'."
-            }
-          },
-          "required": [
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "mkdir"
-            },
-            "path": {
-              "type": "string",
-              "description": "The path of the directory you want to create"
-            }
-          },
-          "required": [
-            "path",
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "mv"
-            },
-            "fromPath": {
-              "type": "string",
-              "description": "Source path"
-            },
-            "toPath": {
-              "type": "string",
-              "description": "Target path"
-            }
-          },
-          "required": [
-            "fromPath",
-            "step",
-            "toPath"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "request"
-            },
-            "request": {
-              "$ref": "#/definitions/PHPRequest",
-              "description": "Request details (See /wordpress-playground/api/universal/interface/PHPRequest)"
-            }
-          },
-          "required": [
-            "request",
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "rm"
-            },
-            "path": {
-              "type": "string",
-              "description": "The path to remove"
-            }
-          },
-          "required": [
-            "path",
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "rmdir"
-            },
-            "path": {
-              "type": "string",
-              "description": "The path to remove"
-            }
-          },
-          "required": [
-            "path",
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "runPHP",
-              "description": "The step identifier."
-            },
-            "code": {
-              "type": "string",
-              "description": "The PHP code to run."
-            }
-          },
-          "required": [
-            "code",
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "runPHPWithOptions"
-            },
-            "options": {
-              "$ref": "#/definitions/PHPRunOptions",
-              "description": "Run options (See /wordpress-playground/api/universal/interface/PHPRunOptions)"
-            }
-          },
-          "required": [
-            "options",
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "runWpInstallationWizard"
-            },
-            "options": {
-              "$ref": "#/definitions/WordPressInstallationOptions"
-            }
-          },
-          "required": [
-            "options",
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "runSql",
-              "description": "The step identifier."
-            },
-            "sql": {
-              "$ref": "#/definitions/FileReference",
-              "description": "The SQL to run. Each non-empty line must contain a valid SQL query."
-            }
-          },
-          "required": [
-            "sql",
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "setPhpIniEntry"
-            },
-            "key": {
-              "type": "string",
-              "description": "Entry name e.g. \"display_errors\""
-            },
-            "value": {
-              "type": "string",
-              "description": "Entry value as a string e.g. \"1\""
-            }
-          },
-          "required": [
-            "key",
-            "step",
-            "value"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "setSiteOptions",
-              "description": "The name of the step. Must be \"setSiteOptions\"."
-            },
-            "options": {
-              "type": "object",
-              "additionalProperties": {},
-              "description": "The options to set on the site."
-            }
-          },
-          "required": [
-            "options",
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "unzip"
-            },
-            "zipFile": {
-              "$ref": "#/definitions/FileReference",
-              "description": "The zip file to extract"
-            },
-            "zipPath": {
-              "type": "string",
-              "description": "The path of the zip file to extract",
-              "deprecated": "Use zipFile instead."
-            },
-            "extractToPath": {
-              "type": "string",
-              "description": "The path to extract the zip file to"
-            }
-          },
-          "required": [
-            "extractToPath",
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "updateUserMeta"
-            },
-            "meta": {
-              "type": "object",
-              "additionalProperties": {},
-              "description": "An object of user meta values to set, e.g. { \"first_name\": \"John\" }"
-            },
-            "userId": {
-              "type": "number",
-              "description": "User ID"
-            }
-          },
-          "required": [
-            "meta",
-            "step",
-            "userId"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "writeFile"
-            },
-            "path": {
-              "type": "string",
-              "description": "The path of the file to write to"
-            },
-            "data": {
-              "anyOf": [
-                {
-                  "$ref": "#/definitions/FileReference"
-                },
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "object",
-                  "properties": {
-                    "BYTES_PER_ELEMENT": {
-                      "type": "number"
-                    },
-                    "buffer": {
-                      "type": "object",
-                      "properties": {
-                        "byteLength": {
-                          "type": "number"
-                        }
-                      },
-                      "required": [
-                        "byteLength"
-                      ],
-                      "additionalProperties": false
-                    },
-                    "byteLength": {
-                      "type": "number"
-                    },
-                    "byteOffset": {
-                      "type": "number"
-                    },
-                    "length": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "BYTES_PER_ELEMENT",
-                    "buffer",
-                    "byteLength",
-                    "byteOffset",
-                    "length"
-                  ],
-                  "additionalProperties": {
-                    "type": "number"
-                  }
-                }
-              ],
-              "description": "The data to write"
-            }
-          },
-          "required": [
-            "data",
-            "path",
-            "step"
-          ]
-        },
-        {
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "progress": {
-              "type": "object",
-              "properties": {
-                "weight": {
-                  "type": "number"
-                },
-                "caption": {
-                  "type": "string"
-                }
-              },
-              "additionalProperties": false
-            },
-            "step": {
-              "type": "string",
-              "const": "wp-cli",
-              "description": "The step identifier."
-            },
-            "command": {
-              "anyOf": [
-                {
-                  "type": "string"
-                },
-                {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
-                  }
-                }
-              ],
-              "description": "The WP CLI command to run."
-            },
-            "wpCliPath": {
-              "type": "string",
-              "description": "wp-cli.phar path"
-            }
-          },
-          "required": [
-            "command",
-            "step"
-          ]
-        }
-      ]
-    },
-    "InstallPluginOptions": {
-      "type": "object",
-      "properties": {
-        "activate": {
-          "type": "boolean",
-          "description": "Whether to activate the plugin after installing it."
-        }
-      },
-      "additionalProperties": false
-    },
-    "PHPRequest": {
-      "type": "object",
-      "properties": {
-        "method": {
-          "$ref": "#/definitions/HTTPMethod",
-          "description": "Request method. Default: `GET`."
-        },
-        "url": {
-          "type": "string",
-          "description": "Request path or absolute URL."
-        },
-        "headers": {
-          "$ref": "#/definitions/PHPRequestHeaders",
-          "description": "Request headers."
-        },
-        "body": {
-          "anyOf": [
-            {
-              "type": "string"
-            },
-            {
-              "type": "object",
-              "properties": {
-                "BYTES_PER_ELEMENT": {
-                  "type": "number"
-                },
-                "buffer": {
-                  "type": "object",
-                  "properties": {
-                    "byteLength": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "byteLength"
-                  ],
-                  "additionalProperties": false
-                },
-                "byteLength": {
-                  "type": "number"
-                },
-                "byteOffset": {
-                  "type": "number"
-                },
-                "length": {
-                  "type": "number"
-                }
-              },
-              "required": [
-                "BYTES_PER_ELEMENT",
-                "buffer",
-                "byteLength",
-                "byteOffset",
-                "length"
-              ],
-              "additionalProperties": {
-                "type": "number"
-              }
-            },
-            {
-              "type": "object",
-              "additionalProperties": {
-                "anyOf": [
-                  {
-                    "type": "string"
-                  },
-                  {
-                    "type": "object",
-                    "properties": {
-                      "BYTES_PER_ELEMENT": {
-                        "type": "number"
-                      },
-                      "buffer": {
-                        "type": "object",
-                        "properties": {
-                          "byteLength": {
-                            "type": "number"
-                          }
-                        },
-                        "required": [
-                          "byteLength"
-                        ],
-                        "additionalProperties": false
-                      },
-                      "byteLength": {
-                        "type": "number"
-                      },
-                      "byteOffset": {
-                        "type": "number"
-                      },
-                      "length": {
-                        "type": "number"
-                      }
-                    },
-                    "required": [
-                      "BYTES_PER_ELEMENT",
-                      "buffer",
-                      "byteLength",
-                      "byteOffset",
-                      "length"
-                    ],
-                    "additionalProperties": {
-                      "type": "number"
-                    }
-                  },
-                  {
-                    "type": "object",
-                    "properties": {
-                      "size": {
-                        "type": "number"
-                      },
-                      "type": {
-                        "type": "string"
-                      },
-                      "lastModified": {
-                        "type": "number"
-                      },
-                      "name": {
-                        "type": "string"
-                      },
-                      "webkitRelativePath": {
-                        "type": "string"
-                      }
-                    },
-                    "required": [
-                      "lastModified",
-                      "name",
-                      "size",
-                      "type",
-                      "webkitRelativePath"
-                    ],
-                    "additionalProperties": false
-                  }
-                ]
-              }
-            }
-          ],
-          "description": "Request body. If an object is given, the request will be encoded as multipart and sent with a `multipart/form-data` header."
-        }
-      },
-      "required": [
-        "url"
-      ],
-      "additionalProperties": false
-    },
-    "HTTPMethod": {
-      "type": "string",
-      "enum": [
-        "GET",
-        "POST",
-        "HEAD",
-        "OPTIONS",
-        "PATCH",
-        "PUT",
-        "DELETE"
-      ]
-    },
-    "PHPRequestHeaders": {
-      "type": "object",
-      "additionalProperties": {
-        "type": "string"
-      }
-    },
-    "PHPRunOptions": {
-      "type": "object",
-      "properties": {
-        "relativeUri": {
-          "type": "string",
-          "description": "Request path following the domain:port part."
-        },
-        "scriptPath": {
-          "type": "string",
-          "description": "Path of the .php file to execute."
-        },
-        "protocol": {
-          "type": "string",
-          "description": "Request protocol."
-        },
-        "method": {
-          "$ref": "#/definitions/HTTPMethod",
-          "description": "Request method. Default: `GET`."
-        },
-        "headers": {
-          "$ref": "#/definitions/PHPRequestHeaders",
-          "description": "Request headers."
-        },
-        "body": {
-          "anyOf": [
-            {
-              "type": "string"
-            },
-            {
-              "type": "object",
-              "properties": {
-                "BYTES_PER_ELEMENT": {
-                  "type": "number"
-                },
-                "buffer": {
-                  "type": "object",
-                  "properties": {
-                    "byteLength": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "byteLength"
-                  ],
-                  "additionalProperties": false
-                },
-                "byteLength": {
-                  "type": "number"
-                },
-                "byteOffset": {
-                  "type": "number"
-                },
-                "length": {
-                  "type": "number"
-                }
-              },
-              "required": [
-                "BYTES_PER_ELEMENT",
-                "buffer",
-                "byteLength",
-                "byteOffset",
-                "length"
-              ],
-              "additionalProperties": {
-                "type": "number"
-              }
-            }
-          ],
-          "description": "Request body."
-        },
-        "code": {
-          "type": "string",
-          "description": "The code snippet to eval instead of a php file."
-        },
-        "throwOnError": {
-          "type": "boolean",
-          "description": "Whether to throw an error if the PHP process exits with a non-zero code or outputs to stderr."
-        }
-      },
-      "additionalProperties": false
-    },
-    "WordPressInstallationOptions": {
-      "type": "object",
-      "properties": {
-        "adminUsername": {
-          "type": "string"
-        },
-        "adminPassword": {
-          "type": "string"
-        }
-      },
-      "additionalProperties": false
-    }
-  }
-}
\ No newline at end of file
+	"$schema": "http://json-schema.org/schema",
+	"$ref": "#/definitions/Blueprint",
+	"definitions": {
+		"Blueprint": {
+			"type": "object",
+			"properties": {
+				"landingPage": {
+					"type": "string",
+					"description": "The URL to navigate to after the blueprint has been run."
+				},
+				"description": {
+					"type": "string",
+					"description": "Optional description. It doesn't do anything but is exposed as a courtesy to developers who may want to document which blueprint file does what."
+				},
+				"preferredVersions": {
+					"type": "object",
+					"properties": {
+						"php": {
+							"anyOf": [
+								{
+									"$ref": "#/definitions/SupportedPHPVersion"
+								},
+								{
+									"type": "string",
+									"const": "latest"
+								}
+							],
+							"description": "The preferred PHP version to use. If not specified, the latest supported version will be used"
+						},
+						"wp": {
+							"type": "string",
+							"description": "The preferred WordPress version to use. If not specified, the latest supported version will be used"
+						}
+					},
+					"required": ["php", "wp"],
+					"additionalProperties": false,
+					"description": "The preferred PHP and WordPress versions to use."
+				},
+				"features": {
+					"type": "object",
+					"properties": {
+						"networking": {
+							"type": "boolean",
+							"description": "Should boot with support for network request via wp_safe_remote_get?"
+						}
+					},
+					"additionalProperties": false
+				},
+				"constants": {
+					"type": "object",
+					"additionalProperties": {
+						"type": "string"
+					},
+					"description": "PHP Constants to define on every request",
+					"deprecated": "This experimental option will change without warning.\nUse `steps` instead."
+				},
+				"plugins": {
+					"type": "array",
+					"items": {
+						"anyOf": [
+							{
+								"type": "string"
+							},
+							{
+								"$ref": "#/definitions/FileReference"
+							}
+						]
+					},
+					"description": "WordPress plugins to install and activate",
+					"deprecated": "This experimental option will change without warning.\nUse `steps` instead."
+				},
+				"siteOptions": {
+					"type": "object",
+					"additionalProperties": {
+						"type": "string"
+					},
+					"properties": {
+						"blogname": {
+							"type": "string",
+							"description": "The site title"
+						}
+					},
+					"description": "WordPress site options to define",
+					"deprecated": "This experimental option will change without warning.\nUse `steps` instead."
+				},
+				"login": {
+					"anyOf": [
+						{
+							"type": "boolean"
+						},
+						{
+							"type": "object",
+							"properties": {
+								"username": {
+									"type": "string"
+								},
+								"password": {
+									"type": "string"
+								}
+							},
+							"required": ["username", "password"],
+							"additionalProperties": false
+						}
+					],
+					"description": "User to log in as. If true, logs the user in as admin/password."
+				},
+				"phpExtensionBundles": {
+					"type": "array",
+					"items": {
+						"$ref": "#/definitions/SupportedPHPExtensionBundle"
+					},
+					"description": "The PHP extensions to use."
+				},
+				"steps": {
+					"type": "array",
+					"items": {
+						"anyOf": [
+							{
+								"$ref": "#/definitions/StepDefinition"
+							},
+							{
+								"type": "string"
+							},
+							{
+								"not": {}
+							},
+							{
+								"type": "boolean",
+								"const": false
+							},
+							{
+								"type": "null"
+							}
+						]
+					},
+					"description": "The steps to run after every other operation in this Blueprint was executed."
+				},
+				"$schema": {
+					"type": "string"
+				}
+			},
+			"additionalProperties": false
+		},
+		"SupportedPHPVersion": {
+			"type": "string",
+			"enum": [
+				"8.3",
+				"8.2",
+				"8.1",
+				"8.0",
+				"7.4",
+				"7.3",
+				"7.2",
+				"7.1",
+				"7.0"
+			]
+		},
+		"FileReference": {
+			"anyOf": [
+				{
+					"$ref": "#/definitions/VFSReference"
+				},
+				{
+					"$ref": "#/definitions/LiteralReference"
+				},
+				{
+					"$ref": "#/definitions/CoreThemeReference"
+				},
+				{
+					"$ref": "#/definitions/CorePluginReference"
+				},
+				{
+					"$ref": "#/definitions/UrlReference"
+				}
+			]
+		},
+		"VFSReference": {
+			"type": "object",
+			"properties": {
+				"resource": {
+					"type": "string",
+					"const": "vfs",
+					"description": "Identifies the file resource as Virtual File System (VFS)"
+				},
+				"path": {
+					"type": "string",
+					"description": "The path to the file in the VFS"
+				}
+			},
+			"required": ["resource", "path"],
+			"additionalProperties": false
+		},
+		"LiteralReference": {
+			"type": "object",
+			"properties": {
+				"resource": {
+					"type": "string",
+					"const": "literal",
+					"description": "Identifies the file resource as a literal file"
+				},
+				"name": {
+					"type": "string",
+					"description": "The name of the file"
+				},
+				"contents": {
+					"anyOf": [
+						{
+							"type": "string"
+						},
+						{
+							"type": "object",
+							"properties": {
+								"BYTES_PER_ELEMENT": {
+									"type": "number"
+								},
+								"buffer": {
+									"type": "object",
+									"properties": {
+										"byteLength": {
+											"type": "number"
+										}
+									},
+									"required": ["byteLength"],
+									"additionalProperties": false
+								},
+								"byteLength": {
+									"type": "number"
+								},
+								"byteOffset": {
+									"type": "number"
+								},
+								"length": {
+									"type": "number"
+								}
+							},
+							"required": [
+								"BYTES_PER_ELEMENT",
+								"buffer",
+								"byteLength",
+								"byteOffset",
+								"length"
+							],
+							"additionalProperties": {
+								"type": "number"
+							}
+						}
+					],
+					"description": "The contents of the file"
+				}
+			},
+			"required": ["resource", "name", "contents"],
+			"additionalProperties": false
+		},
+		"CoreThemeReference": {
+			"type": "object",
+			"properties": {
+				"resource": {
+					"type": "string",
+					"const": "wordpress.org/themes",
+					"description": "Identifies the file resource as a WordPress Core theme"
+				},
+				"slug": {
+					"type": "string",
+					"description": "The slug of the WordPress Core theme"
+				}
+			},
+			"required": ["resource", "slug"],
+			"additionalProperties": false
+		},
+		"CorePluginReference": {
+			"type": "object",
+			"properties": {
+				"resource": {
+					"type": "string",
+					"const": "wordpress.org/plugins",
+					"description": "Identifies the file resource as a WordPress Core plugin"
+				},
+				"slug": {
+					"type": "string",
+					"description": "The slug of the WordPress Core plugin"
+				}
+			},
+			"required": ["resource", "slug"],
+			"additionalProperties": false
+		},
+		"UrlReference": {
+			"type": "object",
+			"properties": {
+				"resource": {
+					"type": "string",
+					"const": "url",
+					"description": "Identifies the file resource as a URL"
+				},
+				"url": {
+					"type": "string",
+					"description": "The URL of the file"
+				},
+				"caption": {
+					"type": "string",
+					"description": "Optional caption for displaying a progress message"
+				}
+			},
+			"required": ["resource", "url"],
+			"additionalProperties": false
+		},
+		"SupportedPHPExtensionBundle": {
+			"type": "string",
+			"const": "kitchen-sink"
+		},
+		"StepDefinition": {
+			"type": "object",
+			"discriminator": {
+				"propertyName": "step"
+			},
+			"required": ["step"],
+			"oneOf": [
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "activatePlugin"
+						},
+						"pluginPath": {
+							"type": "string",
+							"description": "Path to the plugin directory as absolute path (/wordpress/wp-content/plugins/plugin-name); or the plugin entry file relative to the plugins directory (plugin-name/plugin-name.php)."
+						},
+						"pluginName": {
+							"type": "string",
+							"description": "Optional. Plugin name to display in the progress bar."
+						}
+					},
+					"required": ["pluginPath", "step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "activateTheme"
+						},
+						"themeFolderName": {
+							"type": "string",
+							"description": "The name of the theme folder inside wp-content/themes/"
+						}
+					},
+					"required": ["step", "themeFolderName"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "cp"
+						},
+						"fromPath": {
+							"type": "string",
+							"description": "Source path"
+						},
+						"toPath": {
+							"type": "string",
+							"description": "Target path"
+						}
+					},
+					"required": ["fromPath", "step", "toPath"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "defineWpConfigConsts"
+						},
+						"consts": {
+							"type": "object",
+							"additionalProperties": {},
+							"description": "The constants to define"
+						},
+						"method": {
+							"type": "string",
+							"enum": ["rewrite-wp-config", "define-before-run"],
+							"description": "The method of defining the constants. Possible values are:\n\n- rewrite-wp-config: Default. Rewrites the wp-config.php file to                      explicitly call define() with the requested                      name and value. This method alters the file                      on the disk, but it doesn't conflict with                      existing define() calls in wp-config.php.\n- define-before-run: Defines the constant before running the requested                      script. It doesn't alter any files on the disk, but                      constants defined this way may conflict with existing                      define() calls in wp-config.php."
+						},
+						"virtualize": {
+							"type": "boolean",
+							"deprecated": "This option is noop and will be removed in a future version.\nThis option is only kept in here to avoid breaking Blueprint schema validation\nfor existing apps using this option."
+						}
+					},
+					"required": ["consts", "step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "defineSiteUrl"
+						},
+						"siteUrl": {
+							"type": "string",
+							"description": "The URL"
+						}
+					},
+					"required": ["siteUrl", "step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "enableMultisite"
+						}
+					},
+					"required": ["step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "importFile"
+						},
+						"file": {
+							"$ref": "#/definitions/FileReference",
+							"description": "The file to import"
+						}
+					},
+					"required": ["file", "step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "importWordPressFiles"
+						},
+						"wordPressFilesZip": {
+							"$ref": "#/definitions/FileReference",
+							"description": "The zip file containing the top-level WordPress files and directories."
+						},
+						"pathInZip": {
+							"type": "string",
+							"description": "The path inside the zip file where the WordPress files are."
+						}
+					},
+					"required": ["step", "wordPressFilesZip"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "installPlugin",
+							"description": "The step identifier."
+						},
+						"pluginZipFile": {
+							"$ref": "#/definitions/FileReference",
+							"description": "The plugin zip file to install."
+						},
+						"options": {
+							"$ref": "#/definitions/InstallPluginOptions",
+							"description": "Optional installation options."
+						}
+					},
+					"required": ["pluginZipFile", "step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "installTheme",
+							"description": "The step identifier."
+						},
+						"themeZipFile": {
+							"$ref": "#/definitions/FileReference",
+							"description": "The theme zip file to install."
+						},
+						"options": {
+							"type": "object",
+							"properties": {
+								"activate": {
+									"type": "boolean",
+									"description": "Whether to activate the theme after installing it."
+								}
+							},
+							"additionalProperties": false,
+							"description": "Optional installation options."
+						}
+					},
+					"required": ["step", "themeZipFile"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "login"
+						},
+						"username": {
+							"type": "string",
+							"description": "The user to log in as. Defaults to 'admin'."
+						},
+						"password": {
+							"type": "string",
+							"description": "The password to log in with. Defaults to 'password'."
+						}
+					},
+					"required": ["step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "mkdir"
+						},
+						"path": {
+							"type": "string",
+							"description": "The path of the directory you want to create"
+						}
+					},
+					"required": ["path", "step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "mv"
+						},
+						"fromPath": {
+							"type": "string",
+							"description": "Source path"
+						},
+						"toPath": {
+							"type": "string",
+							"description": "Target path"
+						}
+					},
+					"required": ["fromPath", "step", "toPath"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "request"
+						},
+						"request": {
+							"$ref": "#/definitions/PHPRequest",
+							"description": "Request details (See /wordpress-playground/api/universal/interface/PHPRequest)"
+						}
+					},
+					"required": ["request", "step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "rm"
+						},
+						"path": {
+							"type": "string",
+							"description": "The path to remove"
+						}
+					},
+					"required": ["path", "step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "rmdir"
+						},
+						"path": {
+							"type": "string",
+							"description": "The path to remove"
+						}
+					},
+					"required": ["path", "step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "runPHP",
+							"description": "The step identifier."
+						},
+						"code": {
+							"type": "string",
+							"description": "The PHP code to run."
+						}
+					},
+					"required": ["code", "step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "runPHPWithOptions"
+						},
+						"options": {
+							"$ref": "#/definitions/PHPRunOptions",
+							"description": "Run options (See /wordpress-playground/api/universal/interface/PHPRunOptions)"
+						}
+					},
+					"required": ["options", "step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "runWpInstallationWizard"
+						},
+						"options": {
+							"$ref": "#/definitions/WordPressInstallationOptions"
+						}
+					},
+					"required": ["options", "step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "runSql",
+							"description": "The step identifier."
+						},
+						"sql": {
+							"$ref": "#/definitions/FileReference",
+							"description": "The SQL to run. Each non-empty line must contain a valid SQL query."
+						}
+					},
+					"required": ["sql", "step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "setPhpIniEntry"
+						},
+						"key": {
+							"type": "string",
+							"description": "Entry name e.g. \"display_errors\""
+						},
+						"value": {
+							"type": "string",
+							"description": "Entry value as a string e.g. \"1\""
+						}
+					},
+					"required": ["key", "step", "value"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "setSiteOptions",
+							"description": "The name of the step. Must be \"setSiteOptions\"."
+						},
+						"options": {
+							"type": "object",
+							"additionalProperties": {},
+							"description": "The options to set on the site."
+						}
+					},
+					"required": ["options", "step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "unzip"
+						},
+						"zipFile": {
+							"$ref": "#/definitions/FileReference",
+							"description": "The zip file to extract"
+						},
+						"zipPath": {
+							"type": "string",
+							"description": "The path of the zip file to extract",
+							"deprecated": "Use zipFile instead."
+						},
+						"extractToPath": {
+							"type": "string",
+							"description": "The path to extract the zip file to"
+						}
+					},
+					"required": ["extractToPath", "step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "updateUserMeta"
+						},
+						"meta": {
+							"type": "object",
+							"additionalProperties": {},
+							"description": "An object of user meta values to set, e.g. { \"first_name\": \"John\" }"
+						},
+						"userId": {
+							"type": "number",
+							"description": "User ID"
+						}
+					},
+					"required": ["meta", "step", "userId"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "writeFile"
+						},
+						"path": {
+							"type": "string",
+							"description": "The path of the file to write to"
+						},
+						"data": {
+							"anyOf": [
+								{
+									"$ref": "#/definitions/FileReference"
+								},
+								{
+									"type": "string"
+								},
+								{
+									"type": "object",
+									"properties": {
+										"BYTES_PER_ELEMENT": {
+											"type": "number"
+										},
+										"buffer": {
+											"type": "object",
+											"properties": {
+												"byteLength": {
+													"type": "number"
+												}
+											},
+											"required": ["byteLength"],
+											"additionalProperties": false
+										},
+										"byteLength": {
+											"type": "number"
+										},
+										"byteOffset": {
+											"type": "number"
+										},
+										"length": {
+											"type": "number"
+										}
+									},
+									"required": [
+										"BYTES_PER_ELEMENT",
+										"buffer",
+										"byteLength",
+										"byteOffset",
+										"length"
+									],
+									"additionalProperties": {
+										"type": "number"
+									}
+								}
+							],
+							"description": "The data to write"
+						}
+					},
+					"required": ["data", "path", "step"]
+				},
+				{
+					"type": "object",
+					"additionalProperties": false,
+					"properties": {
+						"progress": {
+							"type": "object",
+							"properties": {
+								"weight": {
+									"type": "number"
+								},
+								"caption": {
+									"type": "string"
+								}
+							},
+							"additionalProperties": false
+						},
+						"step": {
+							"type": "string",
+							"const": "wp-cli",
+							"description": "The step identifier."
+						},
+						"command": {
+							"anyOf": [
+								{
+									"type": "string"
+								},
+								{
+									"type": "array",
+									"items": {
+										"type": "string"
+									}
+								}
+							],
+							"description": "The WP CLI command to run."
+						},
+						"wpCliPath": {
+							"type": "string",
+							"description": "wp-cli.phar path"
+						}
+					},
+					"required": ["command", "step"]
+				}
+			]
+		},
+		"InstallPluginOptions": {
+			"type": "object",
+			"properties": {
+				"activate": {
+					"type": "boolean",
+					"description": "Whether to activate the plugin after installing it."
+				}
+			},
+			"additionalProperties": false
+		},
+		"PHPRequest": {
+			"type": "object",
+			"properties": {
+				"method": {
+					"$ref": "#/definitions/HTTPMethod",
+					"description": "Request method. Default: `GET`."
+				},
+				"url": {
+					"type": "string",
+					"description": "Request path or absolute URL."
+				},
+				"headers": {
+					"$ref": "#/definitions/PHPRequestHeaders",
+					"description": "Request headers."
+				},
+				"files": {
+					"type": "object",
+					"additionalProperties": {
+						"type": "object",
+						"properties": {
+							"size": {
+								"type": "number"
+							},
+							"type": {
+								"type": "string"
+							},
+							"lastModified": {
+								"type": "number"
+							},
+							"name": {
+								"type": "string"
+							},
+							"webkitRelativePath": {
+								"type": "string"
+							}
+						},
+						"required": [
+							"lastModified",
+							"name",
+							"size",
+							"type",
+							"webkitRelativePath"
+						],
+						"additionalProperties": false
+					},
+					"description": "Uploaded files"
+				},
+				"body": {
+					"type": "string",
+					"description": "Request body without the files."
+				},
+				"formData": {
+					"type": "object",
+					"additionalProperties": {},
+					"description": "Form data. If set, the request body will be ignored and the content-type header will be set to `application/x-www-form-urlencoded`."
+				}
+			},
+			"required": ["url"],
+			"additionalProperties": false
+		},
+		"HTTPMethod": {
+			"type": "string",
+			"enum": ["GET", "POST", "HEAD", "OPTIONS", "PATCH", "PUT", "DELETE"]
+		},
+		"PHPRequestHeaders": {
+			"type": "object",
+			"additionalProperties": {
+				"type": "string"
+			}
+		},
+		"PHPRunOptions": {
+			"type": "object",
+			"properties": {
+				"relativeUri": {
+					"type": "string",
+					"description": "Request path following the domain:port part."
+				},
+				"scriptPath": {
+					"type": "string",
+					"description": "Path of the .php file to execute."
+				},
+				"protocol": {
+					"type": "string",
+					"description": "Request protocol."
+				},
+				"method": {
+					"$ref": "#/definitions/HTTPMethod",
+					"description": "Request method. Default: `GET`."
+				},
+				"headers": {
+					"$ref": "#/definitions/PHPRequestHeaders",
+					"description": "Request headers."
+				},
+				"body": {
+					"type": "string",
+					"description": "Request body without the files."
+				},
+				"fileInfos": {
+					"type": "array",
+					"items": {
+						"$ref": "#/definitions/FileInfo"
+					},
+					"description": "Uploaded files."
+				},
+				"code": {
+					"type": "string",
+					"description": "The code snippet to eval instead of a php file."
+				},
+				"throwOnError": {
+					"type": "boolean",
+					"description": "Whether to throw an error if the PHP process exits with a non-zero code or outputs to stderr."
+				}
+			},
+			"additionalProperties": false
+		},
+		"FileInfo": {
+			"type": "object",
+			"properties": {
+				"key": {
+					"type": "string"
+				},
+				"name": {
+					"type": "string"
+				},
+				"type": {
+					"type": "string"
+				},
+				"data": {
+					"type": "object",
+					"properties": {
+						"BYTES_PER_ELEMENT": {
+							"type": "number"
+						},
+						"buffer": {
+							"type": "object",
+							"properties": {
+								"byteLength": {
+									"type": "number"
+								}
+							},
+							"required": ["byteLength"],
+							"additionalProperties": false
+						},
+						"byteLength": {
+							"type": "number"
+						},
+						"byteOffset": {
+							"type": "number"
+						},
+						"length": {
+							"type": "number"
+						}
+					},
+					"required": [
+						"BYTES_PER_ELEMENT",
+						"buffer",
+						"byteLength",
+						"byteOffset",
+						"length"
+					],
+					"additionalProperties": {
+						"type": "number"
+					}
+				}
+			},
+			"required": ["key", "name", "type", "data"],
+			"additionalProperties": false
+		},
+		"WordPressInstallationOptions": {
+			"type": "object",
+			"properties": {
+				"adminUsername": {
+					"type": "string"
+				},
+				"adminPassword": {
+					"type": "string"
+				}
+			},
+			"additionalProperties": false
+		}
+	}
+}
diff --git a/packages/playground/website/tsconfig.app.json b/packages/playground/website/tsconfig.app.json
index e0654f6947..9b9b776920 100644
--- a/packages/playground/website/tsconfig.app.json
+++ b/packages/playground/website/tsconfig.app.json
@@ -30,5 +30,5 @@
 		"demos/terminal.ts",
 		"demos/terminal-component.tsx",
 		"./cypress.config.ts"
-]
+	]
 }

From cabbd9b66a996f7cf60384ea23be10a43e95768a Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Wed, 21 Feb 2024 12:57:48 +0100
Subject: [PATCH 17/30] Address feedback

---
 .../php-wasm/universal/src/lib/base-php.ts    | 14 +---
 .../universal/src/lib/universal-php.ts        |  6 --
 .../php-wasm/web/src/lib/web-php-endpoint.ts  |  5 --
 .../blueprints/src/lib/utils/logger.ts        | 80 ++++++++++---------
 4 files changed, 45 insertions(+), 60 deletions(-)

diff --git a/packages/php-wasm/universal/src/lib/base-php.ts b/packages/php-wasm/universal/src/lib/base-php.ts
index ef5b9bb8e0..5e4da4a89f 100644
--- a/packages/php-wasm/universal/src/lib/base-php.ts
+++ b/packages/php-wasm/universal/src/lib/base-php.ts
@@ -234,15 +234,6 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 		return this.requestHandler.request(request, maxRedirects);
 	}
 
-	/** @inheritDoc */
-	getRequestPhpErrorLog() {
-		const logPath = '/wordpress/wp-content/debug.log';
-		if (!this.fileExists(logPath)) {
-			return '';
-		}
-		return this.readFileAsText(logPath);
-	}
-
 	/** @inheritDoc */
 	async run(request: PHPRunOptions): Promise<PHPResponse> {
 		/*
@@ -296,10 +287,7 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 			} finally {
 				release();
 				this.dispatchEvent({
-					type: 'request.end',
-					data: {
-						log: this.getRequestPhpErrorLog(),
-					},
+					type: 'request.end'
 				});
 			}
 		}
diff --git a/packages/php-wasm/universal/src/lib/universal-php.ts b/packages/php-wasm/universal/src/lib/universal-php.ts
index aa4e5ad912..f75d734f25 100644
--- a/packages/php-wasm/universal/src/lib/universal-php.ts
+++ b/packages/php-wasm/universal/src/lib/universal-php.ts
@@ -6,7 +6,6 @@ import { PHPResponse } from './php-response';
  */
 export interface PHPRequestEndEvent {
 	type: 'request.end';
-	data?: {[log: string]: string};
 }
 
 /**
@@ -323,11 +322,6 @@ export interface IsomorphicLocalPHP extends RequestHandler {
 	 */
 	chdir(path: string): void;
 
-	/**
-	 * Get PHP error log data.
-	 */
-	getRequestPhpErrorLog(): string;
-
 	/**
 	 * Runs PHP code.
 	 *
diff --git a/packages/php-wasm/web/src/lib/web-php-endpoint.ts b/packages/php-wasm/web/src/lib/web-php-endpoint.ts
index cec7db9fb6..75d936845d 100644
--- a/packages/php-wasm/web/src/lib/web-php-endpoint.ts
+++ b/packages/php-wasm/web/src/lib/web-php-endpoint.ts
@@ -99,11 +99,6 @@ export class WebPHPEndpoint implements IsomorphicLocalPHP {
 		return _private.get(this)!.php.request(request, redirects);
 	}
 
-	/** @inheritDoc @php-wasm/universal!RequestHandler.getRequestPhpErrorLog */
-	getRequestPhpErrorLog() {
-		return _private.get(this)!.php.getRequestPhpErrorLog();
-	}
-
 	/** @inheritDoc @php-wasm/web!WebPHP.run */
 	async run(request: PHPRunOptions): Promise<PHPResponse> {
 		return _private.get(this)!.php.run(request);
diff --git a/packages/playground/blueprints/src/lib/utils/logger.ts b/packages/playground/blueprints/src/lib/utils/logger.ts
index 4d450a1fae..e22ad14917 100644
--- a/packages/playground/blueprints/src/lib/utils/logger.ts
+++ b/packages/playground/blueprints/src/lib/utils/logger.ts
@@ -1,20 +1,8 @@
-import { PHPRequestEndEvent } from "@php-wasm/universal/src/lib/universal-php";
 import { UniversalPHP } from "@php-wasm/universal/src/lib/universal-php";
 /**
  * Log severity levels.
  */
-export enum LogSeverity {
-    // A debugging event.
-    Debug,
-    // An informational event. Indicates that an event happenedate.
-    Info,
-    // A warning event. Not an error but is likely more important than an informational event.
-    Warn,
-    // An error event. Something went wrong.
-    Error,
-    // A fatal error such as application or system crash.
-    Fatal,
-}
+export type LogSeverity = 'debug' | 'info' | 'warn' | 'error' | 'fatal';
 
 /**
  * A logger for Playground.
@@ -28,45 +16,58 @@ export class Logger {
     private lastPHPLogLength = 0;
 
     constructor() {
-        this.collectPlaygroundLogs();
+        this.collectJavaScriptErrors();
     }
 
     /**
-     * Collect errors from Playground and log them.
+     * Collect errors from JavaScript window events like error and log them.
      */
-    private collectPlaygroundLogs() {
+    private collectJavaScriptErrors() {
          if (typeof window !== 'undefined') {
             window.addEventListener('error', (event) => {
                 this.log(
                     `${event.message} in ${event.filename} on line ${event.lineno}:${event.colno}`,
-                    LogSeverity.Fatal
+                    'fatal'
                 );
             });
             window.addEventListener('unhandledrejection', (event) => {
                 this.log(
                     `${event.reason.stack}`,
-                    LogSeverity.Fatal
+                    'fatal'
                 );
             });
             window.addEventListener('rejectionhandled', (event) => {
                 this.log(
                     `${event.reason.stack}`,
-                    LogSeverity.Fatal
+                    'fatal'
                 );
             });
         }
     }
 
+    /**
+     * Read the WordPress debug.log file and return its content.
+     *
+     * @param UniversalPHP playground instance
+     * @returns string The content of the debug.log file
+     */
+	private async getRequestPhpErrorLog(playground: UniversalPHP) {
+		const logPath = '/wordpress/wp-content/debug.log';
+		if (!await playground.fileExists(logPath)) {
+			return '';
+		}
+		return await playground.readFileAsText(logPath);
+	}
     /**
      * Register a listener for the request.end event and log the data.
      * @param UniversalPHP playground instance
      */
     public addPlaygroundRequestEndListener(playground: UniversalPHP) {
-        playground.addEventListener('request.end', (event) => {
-            event = event as PHPRequestEndEvent;
-            if (event.data && event.data['log']) {
-                this.logRaw(event?.data['log'].substring(this.lastPHPLogLength));
-                this.lastPHPLogLength = event.data['log'].length;
+        playground.addEventListener('request.end', async () => {
+            const log = await this.getRequestPhpErrorLog(playground);
+            if (log.length > this.lastPHPLogLength) {
+                this.logRaw(log.substring(this.lastPHPLogLength));
+                this.lastPHPLogLength = log.length;
             }
         } );
     }
@@ -79,15 +80,22 @@ export class Logger {
      * @returns string
      */
     private formatLogDate(date: Date): string {
-        const day = String(date.getUTCDate()).padStart(2, '0');
-        const monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-        const month = monthNames[date.getUTCMonth()];
-        const year = date.getUTCFullYear();
-        const hours = String(date.getUTCHours()).padStart(2, '0');
-        const minutes = String(date.getUTCMinutes()).padStart(2, '0');
-        const seconds = String(date.getUTCSeconds()).padStart(2, '0');
+        const formattedDate = new Intl.DateTimeFormat('en-GB', {
+            year: 'numeric',
+            month: 'short',
+            day: '2-digit',
+            timeZone: 'UTC',
+        }).format(date).replace(/ /g, '-');
 
-        return `${day}-${month}-${year} ${hours}:${minutes}:${seconds} UTC`;
+        const formattedTime = new Intl.DateTimeFormat('en-GB', {
+            hour: '2-digit',
+            minute: '2-digit',
+            second: '2-digit',
+            hour12: false,
+            timeZone: 'UTC',
+            timeZoneName: 'short'
+        }).format(date);
+        return formattedDate + ' ' + formattedTime;
     }
 
     /**
@@ -95,9 +103,9 @@ export class Logger {
      * @param string message
      * @param LogSeverity severity
      */
-    public formatLog(message: string, severity: LogSeverity): string {
+    public formatMessage(message: string, severity: LogSeverity): string {
         const now = this.formatLogDate(new Date());
-        return `[${now}] ${this.LOG_PREFIX} ${LogSeverity[severity]}: ${message}`;
+        return `[${now}] ${this.LOG_PREFIX} ${severity}: ${message}`;
     }
 
     /**
@@ -107,9 +115,9 @@ export class Logger {
      */
     public log(message: string, severity?: LogSeverity): void {
         if (severity === undefined) {
-            severity = LogSeverity.Info;
+            severity = 'info';
         }
-        const log = this.formatLog(message, severity);
+        const log = this.formatMessage(message, severity);
         this.logRaw(log);
     }
 

From 5ab98c781a4c7100931ba2c0a219b69ceb0d7326 Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Wed, 21 Feb 2024 13:05:50 +0100
Subject: [PATCH 18/30] Reset base-php

---
 packages/php-wasm/universal/src/lib/base-php.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/php-wasm/universal/src/lib/base-php.ts b/packages/php-wasm/universal/src/lib/base-php.ts
index 5e4da4a89f..c45b910800 100644
--- a/packages/php-wasm/universal/src/lib/base-php.ts
+++ b/packages/php-wasm/universal/src/lib/base-php.ts
@@ -287,7 +287,7 @@ export abstract class BasePHP implements IsomorphicLocalPHP {
 			} finally {
 				release();
 				this.dispatchEvent({
-					type: 'request.end'
+					type: 'request.end',
 				});
 			}
 		}

From c9f0b5c8bb33b5e7a542c393fbf18c0a2965ae93 Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Thu, 22 Feb 2024 15:21:26 +0100
Subject: [PATCH 19/30] Move logger to package

---
 .../playground/blueprints/src/lib/compile.ts  |  4 ----
 .../src/lib/utils => logger}/logger.ts        | 20 +++++++++++++------
 tsconfig.base.json                            |  5 ++++-
 3 files changed, 18 insertions(+), 11 deletions(-)
 rename packages/playground/{blueprints/src/lib/utils => logger}/logger.ts (88%)

diff --git a/packages/playground/blueprints/src/lib/compile.ts b/packages/playground/blueprints/src/lib/compile.ts
index 5b7c37a431..1fb4da6ef5 100644
--- a/packages/playground/blueprints/src/lib/compile.ts
+++ b/packages/playground/blueprints/src/lib/compile.ts
@@ -14,7 +14,6 @@ import { FileReference, isFileReference, Resource } from './resources';
 import { Step, StepDefinition } from './steps';
 import * as allStepHandlers from './steps/handlers';
 import { Blueprint } from './blueprint'
-import { get_logger } from './utils/logger';
 
 // @TODO: Configure this in the `wp-cli` step, not here.
 const { wpCLI, ...otherStepHandlers } = allStepHandlers;
@@ -221,9 +220,6 @@ export function compileBlueprint(
 			networking: blueprint.features?.networking ?? false,
 		},
 		run: async (playground: UniversalPHP) => {
-			// Initialize logger
-			const logger = get_logger();
-			logger.addPlaygroundRequestEndListener(playground);
 			try {
 				// Start resolving resources early
 				for (const { resources } of compiled) {
diff --git a/packages/playground/blueprints/src/lib/utils/logger.ts b/packages/playground/logger/logger.ts
similarity index 88%
rename from packages/playground/blueprints/src/lib/utils/logger.ts
rename to packages/playground/logger/logger.ts
index e22ad14917..f636a5b88a 100644
--- a/packages/playground/blueprints/src/lib/utils/logger.ts
+++ b/packages/playground/logger/logger.ts
@@ -15,7 +15,15 @@ export class Logger {
      */
     private lastPHPLogLength = 0;
 
-    constructor() {
+    /**
+     * The path to the error log file.
+     */
+    private errorLogPath = '/wordpress/wp-content/debug.log';
+
+    constructor(errorLogPath?: string) {
+        if (errorLogPath) {
+            this.errorLogPath = errorLogPath;
+        }
         this.collectJavaScriptErrors();
     }
 
@@ -52,11 +60,10 @@ export class Logger {
      * @returns string The content of the debug.log file
      */
 	private async getRequestPhpErrorLog(playground: UniversalPHP) {
-		const logPath = '/wordpress/wp-content/debug.log';
-		if (!await playground.fileExists(logPath)) {
+		if (!await playground.fileExists(this.errorLogPath)) {
 			return '';
 		}
-		return await playground.readFileAsText(logPath);
+		return await playground.readFileAsText(this.errorLogPath);
 	}
     /**
      * Register a listener for the request.end event and log the data.
@@ -138,11 +145,12 @@ let logger: Logger | undefined = undefined;
 /**
  * Get the logger instance.
  *
+ * @param errorLogPath The path to the error log file.
  * @returns Logger
  */
-export function get_logger(): Logger {
+export function get_logger(errorLogPath?: string): Logger {
     if (!logger) {
-        logger = new Logger();
+        logger = new Logger(errorLogPath);
     }
     return logger;
 }
\ No newline at end of file
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 266c10c2ad..f75342e2fb 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -63,7 +63,10 @@
 			],
 			"@wp-playground/wordpress": [
 				"packages/playground/wordpress/src/index.ts"
-			]
+			],
+			"@wp-playground/logger": [
+				"packages/playground/logger/logger.ts"
+			],
 		}
 	},
 	"exclude": ["node_modules", "tmp"]

From f28c20a98fe7d2a7b6b3ca42145138ecafb0e3f3 Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Thu, 22 Feb 2024 15:32:24 +0100
Subject: [PATCH 20/30] Start logger in client and node

---
 packages/playground/client/src/index.ts | 2 ++
 packages/playground/node/src/index.ts   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/playground/client/src/index.ts b/packages/playground/client/src/index.ts
index deb097b8e3..a21632db13 100644
--- a/packages/playground/client/src/index.ts
+++ b/packages/playground/client/src/index.ts
@@ -38,6 +38,7 @@ import {
 import { consumeAPI } from '@php-wasm/web';
 import { ProgressTracker } from '@php-wasm/progress';
 import { PlaygroundClient } from '@wp-playground/remote';
+import { get_logger } from '@wp-playground/logger';
 export interface StartPlaygroundOptions {
 	iframe: HTMLIFrameElement;
 	remoteUrl: string;
@@ -94,6 +95,7 @@ export async function startPlaygroundWeb({
 		}),
 		progressTracker
 	);
+	get_logger().addPlaygroundRequestEndListener(playground);
 	await runBlueprintSteps(compiled, playground);
 	progressTracker.finish();
 
diff --git a/packages/playground/node/src/index.ts b/packages/playground/node/src/index.ts
index 82b413e90f..de59544511 100644
--- a/packages/playground/node/src/index.ts
+++ b/packages/playground/node/src/index.ts
@@ -13,6 +13,7 @@ import {
 } from '@wp-playground/blueprints';
 import { NodePHP } from '@php-wasm/node';
 import { UniversalPHP } from '@php-wasm/universal';
+import { get_logger } from '@wp-playground/logger';
 
 export interface NodePlaygroundOptions {
 	blueprint?: Blueprint;
@@ -42,6 +43,7 @@ export async function startPlaygroundNode(
 			absoluteUrl: options.serverUrl,
 		},
 	});
+	get_logger( `${options.wordpressPathOnHost}/wp-content/debug.log` ).addPlaygroundRequestEndListener(playground);
 
 	await defineSiteUrl(playground, {
 		siteUrl: options.serverUrl,
@@ -64,7 +66,7 @@ export async function allowWpOrgHosts(
 		// Needed because gethostbyname( 'wordpress.org' ) returns
 		// a private network IP address for some reason.
 		add_filter( 'allowed_redirect_hosts', function( $deprecated = '' ) {
-			return array( 
+			return array(
 				'wordpress.org',
 				'api.wordpress.org',
 				'downloads.wordpress.org',

From be90919ca2092dcabaed9093fe9f9fc014a0f8d7 Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Fri, 23 Feb 2024 07:58:14 +0100
Subject: [PATCH 21/30] Remove node logger

---
 packages/playground/node/src/index.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/playground/node/src/index.ts b/packages/playground/node/src/index.ts
index de59544511..1503681be5 100644
--- a/packages/playground/node/src/index.ts
+++ b/packages/playground/node/src/index.ts
@@ -13,7 +13,6 @@ import {
 } from '@wp-playground/blueprints';
 import { NodePHP } from '@php-wasm/node';
 import { UniversalPHP } from '@php-wasm/universal';
-import { get_logger } from '@wp-playground/logger';
 
 export interface NodePlaygroundOptions {
 	blueprint?: Blueprint;
@@ -43,7 +42,6 @@ export async function startPlaygroundNode(
 			absoluteUrl: options.serverUrl,
 		},
 	});
-	get_logger( `${options.wordpressPathOnHost}/wp-content/debug.log` ).addPlaygroundRequestEndListener(playground);
 
 	await defineSiteUrl(playground, {
 		siteUrl: options.serverUrl,

From d0398a321b4b9810c5106ddca8c33ac95cd24bbf Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Fri, 23 Feb 2024 08:34:58 +0100
Subject: [PATCH 22/30] Set WP_DEBUG only if WP exists

---
 packages/playground/remote/src/lib/worker-thread.ts | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/packages/playground/remote/src/lib/worker-thread.ts b/packages/playground/remote/src/lib/worker-thread.ts
index b669d5f9ef..f44f58e3f2 100644
--- a/packages/playground/remote/src/lib/worker-thread.ts
+++ b/packages/playground/remote/src/lib/worker-thread.ts
@@ -256,6 +256,9 @@ try {
 		// Randomize the WordPress secrets
 		await defineWpConfigConsts(php, {
 			consts: {
+				WP_DEBUG: true,
+				WP_DEBUG_LOG: true,
+				WP_DEBUG_DISPLAY: false,
 				AUTH_KEY: randomString(40),
 				SECURE_AUTH_KEY: randomString(40),
 				LOGGED_IN_KEY: randomString(40),
@@ -268,15 +271,6 @@ try {
 		});
 	}
 
-	// Enable the WordPress debug mode
-	await defineWpConfigConsts(php, {
-		consts: {
-			WP_DEBUG: true,
-			WP_DEBUG_LOG: true,
-			WP_DEBUG_DISPLAY: false,
-		},
-	});
-
 	// Always install the playground mu-plugin, even if WordPress is loaded
 	// from the OPFS. This ensures:
 	// * The mu-plugin is always there, even when a custom WordPress directory

From 0650878d133d66746daf38bdb0b7066ef7643fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?berislav=20grgi=C4=8Dak?= <berislav.grgicak@gmail.com>
Date: Fri, 23 Feb 2024 10:14:09 +0100
Subject: [PATCH 23/30] Update packages/playground/logger/logger.ts

---
 packages/playground/logger/logger.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/playground/logger/logger.ts b/packages/playground/logger/logger.ts
index f636a5b88a..3c468700f9 100644
--- a/packages/playground/logger/logger.ts
+++ b/packages/playground/logger/logger.ts
@@ -153,4 +153,4 @@ export function get_logger(errorLogPath?: string): Logger {
         logger = new Logger(errorLogPath);
     }
     return logger;
-}
\ No newline at end of file
+}

From a192ceb12607a830cc8af724ad6cc5d8a74ce846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?berislav=20grgi=C4=8Dak?= <berislav.grgicak@gmail.com>
Date: Fri, 23 Feb 2024 10:14:31 +0100
Subject: [PATCH 24/30] Update
 packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php

---
 .../playground-includes/playground_logger.php                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php b/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php
index acb45646d5..89c0fa4867 100644
--- a/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php
+++ b/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php
@@ -6,4 +6,4 @@
 ini_set('error_log', $log_file);
 ini_set('ignore_repeated_errors', true);
 ini_set('display_errors', false);
-ini_set('log_errors', true);
\ No newline at end of file
+ini_set('log_errors', true);

From b14f4a520ef31d306170254a5f5a2786abaa128a Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Mon, 26 Feb 2024 15:57:13 +0100
Subject: [PATCH 25/30] Move logger to a buildable package

---
 package-lock.json                             | 12 +++++
 packages/php-wasm/logger/README.md            |  0
 packages/php-wasm/logger/package.json         | 28 +++++++++++
 packages/php-wasm/logger/project.json         | 50 +++++++++++++++++++
 packages/php-wasm/logger/src/index.ts         |  1 +
 .../logger => php-wasm/logger/src}/logger.ts  |  2 +-
 packages/php-wasm/logger/tsconfig.json        | 23 +++++++++
 packages/php-wasm/logger/tsconfig.lib.json    | 10 ++++
 packages/php-wasm/logger/tsconfig.spec.json   | 19 +++++++
 packages/php-wasm/logger/vite.config.ts       | 48 ++++++++++++++++++
 packages/playground/client/src/index.ts       |  4 +-
 packages/playground/node/src/index.ts         |  3 ++
 tsconfig.base.json                            |  8 +--
 13 files changed, 201 insertions(+), 7 deletions(-)
 create mode 100644 packages/php-wasm/logger/README.md
 create mode 100644 packages/php-wasm/logger/package.json
 create mode 100644 packages/php-wasm/logger/project.json
 create mode 100644 packages/php-wasm/logger/src/index.ts
 rename packages/{playground/logger => php-wasm/logger/src}/logger.ts (98%)
 create mode 100644 packages/php-wasm/logger/tsconfig.json
 create mode 100644 packages/php-wasm/logger/tsconfig.lib.json
 create mode 100644 packages/php-wasm/logger/tsconfig.spec.json
 create mode 100644 packages/php-wasm/logger/vite.config.ts

diff --git a/package-lock.json b/package-lock.json
index 98df7737ba..8f71df2eaf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13990,6 +13990,10 @@
 			"resolved": "packages/php-wasm/fs-journal",
 			"link": true
 		},
+		"node_modules/@php-wasm/logger": {
+			"resolved": "packages/php-wasm/logger",
+			"link": true
+		},
 		"node_modules/@php-wasm/node": {
 			"resolved": "packages/php-wasm/node",
 			"link": true
@@ -44944,6 +44948,14 @@
 				"npm": ">=8.11.0"
 			}
 		},
+		"packages/php-wasm/logger": {
+			"version": "0.0.1",
+			"license": "GPL-2.0-or-later",
+			"engines": {
+				"node": ">=18.18.2",
+				"npm": ">=8.11.0"
+			}
+		},
 		"packages/php-wasm/node": {
 			"name": "@php-wasm/node",
 			"version": "0.6.3",
diff --git a/packages/php-wasm/logger/README.md b/packages/php-wasm/logger/README.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/php-wasm/logger/package.json b/packages/php-wasm/logger/package.json
new file mode 100644
index 0000000000..8c346b0991
--- /dev/null
+++ b/packages/php-wasm/logger/package.json
@@ -0,0 +1,28 @@
+{
+	"name": "@php-wasm/logger",
+	"version": "0.0.1",
+	"description": "A logger for PHP-wasm clients like Playground and WP-now.",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/WordPress/wordpress-playground"
+	},
+	"homepage": "https://developer.wordpress.org/playground",
+	"author": "The WordPress contributors",
+	"typedoc": {
+		"entryPoint": "./src/index.ts",
+		"readmeFile": "./README.md",
+		"displayName": "@php-wasm/logger",
+		"tsconfig": "./tsconfig.lib.json"
+	},
+	"publishConfig": {
+		"access": "public",
+		"directory": "../../../dist/packages/php-wasm/logger"
+	},
+	"license": "GPL-2.0-or-later",
+	"main": "index.cjs",
+	"types": "index.d.ts",
+	"engines": {
+		"node": ">=18.18.2",
+		"npm": ">=8.11.0"
+	}
+}
diff --git a/packages/php-wasm/logger/project.json b/packages/php-wasm/logger/project.json
new file mode 100644
index 0000000000..d9a1f51f3f
--- /dev/null
+++ b/packages/php-wasm/logger/project.json
@@ -0,0 +1,50 @@
+{
+	"name": "php-wasm-logger",
+	"$schema": "../../../node_modules/nx/schemas/project-schema.json",
+	"sourceRoot": "packages/php-wasm/logger/src",
+	"projectType": "library",
+	"targets": {
+		"build": {
+			"executor": "@nx/vite:build",
+			"outputs": ["{options.outputPath}"],
+			"options": {
+				"outputPath": "dist/packages/php-wasm/logger"
+			}
+		},
+		"test": {
+			"executor": "nx:noop",
+			"dependsOn": ["test:vite"]
+		},
+		"test:esmcjs": {
+			"executor": "@wp-playground/nx-extensions:assert-built-esm-and-cjs",
+			"options": {
+				"outputPath": "dist/packages/php-wasm/logger"
+			},
+			"dependsOn": ["build"]
+		},
+		"test:vite": {
+			"executor": "@nx/vite:test",
+			"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/logger"],
+			"options": {
+				"passWithNoTests": true,
+				"reportsDirectory": "../../../coverage/packages/php-wasm/logger"
+			}
+		},
+		"lint": {
+			"executor": "@nx/linter:eslint",
+			"outputs": ["{options.outputFile}"],
+			"options": {
+				"lintFilePatterns": ["packages/php-wasm/logger/**/*.ts"]
+			}
+		}
+	},
+	"typecheck": {
+		"executor": "nx:run-commands",
+		"options": {
+			"commands": [
+				"tsc -p packages/php-wasm/logger/tsconfig.lib.json --noEmit",
+				"tsc -p packages/php-wasm/logger/tsconfig.spec.json --noEmit"
+			]
+		}
+	}
+}
diff --git a/packages/php-wasm/logger/src/index.ts b/packages/php-wasm/logger/src/index.ts
new file mode 100644
index 0000000000..7754e4e2fb
--- /dev/null
+++ b/packages/php-wasm/logger/src/index.ts
@@ -0,0 +1 @@
+export * from './logger';
\ No newline at end of file
diff --git a/packages/playground/logger/logger.ts b/packages/php-wasm/logger/src/logger.ts
similarity index 98%
rename from packages/playground/logger/logger.ts
rename to packages/php-wasm/logger/src/logger.ts
index 3c468700f9..f33bdebce7 100644
--- a/packages/playground/logger/logger.ts
+++ b/packages/php-wasm/logger/src/logger.ts
@@ -148,7 +148,7 @@ let logger: Logger | undefined = undefined;
  * @param errorLogPath The path to the error log file.
  * @returns Logger
  */
-export function get_logger(errorLogPath?: string): Logger {
+export function getLogger(errorLogPath?: string): Logger {
     if (!logger) {
         logger = new Logger(errorLogPath);
     }
diff --git a/packages/php-wasm/logger/tsconfig.json b/packages/php-wasm/logger/tsconfig.json
new file mode 100644
index 0000000000..a6f5201524
--- /dev/null
+++ b/packages/php-wasm/logger/tsconfig.json
@@ -0,0 +1,23 @@
+{
+	"extends": "../../../tsconfig.base.json",
+	"compilerOptions": {
+		"forceConsistentCasingInFileNames": true,
+		"strict": true,
+		"noImplicitOverride": true,
+		"allowSyntheticDefaultImports": true,
+		"noPropertyAccessFromIndexSignature": true,
+		"noImplicitReturns": true,
+		"noFallthroughCasesInSwitch": true,
+		"types": ["vitest"]
+	},
+	"files": [],
+	"include": [],
+	"references": [
+		{
+			"path": "./tsconfig.lib.json"
+		},
+		{
+			"path": "./tsconfig.spec.json"
+		}
+	]
+}
diff --git a/packages/php-wasm/logger/tsconfig.lib.json b/packages/php-wasm/logger/tsconfig.lib.json
new file mode 100644
index 0000000000..829b0bc14c
--- /dev/null
+++ b/packages/php-wasm/logger/tsconfig.lib.json
@@ -0,0 +1,10 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"outDir": "../../../dist/out-tsc",
+		"declaration": true,
+		"types": ["node"]
+	},
+	"include": ["src/**/*.ts"],
+	"exclude": ["jest.config.ts", "src/**/*.spec.ts", "src/**/*.test.ts"]
+}
diff --git a/packages/php-wasm/logger/tsconfig.spec.json b/packages/php-wasm/logger/tsconfig.spec.json
new file mode 100644
index 0000000000..eb23daacbc
--- /dev/null
+++ b/packages/php-wasm/logger/tsconfig.spec.json
@@ -0,0 +1,19 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"outDir": "../../dist/out-tsc",
+		"types": ["vitest/globals", "vitest/importMeta", "vite/client", "node"]
+	},
+	"include": [
+		"vite.config.ts",
+		"src/**/*.test.ts",
+		"src/**/*.spec.ts",
+		"src/**/*.test.tsx",
+		"src/**/*.spec.tsx",
+		"src/**/*.test.js",
+		"src/**/*.spec.js",
+		"src/**/*.test.jsx",
+		"src/**/*.spec.jsx",
+		"src/**/*.d.ts"
+	]
+}
diff --git a/packages/php-wasm/logger/vite.config.ts b/packages/php-wasm/logger/vite.config.ts
new file mode 100644
index 0000000000..09ac745a38
--- /dev/null
+++ b/packages/php-wasm/logger/vite.config.ts
@@ -0,0 +1,48 @@
+/// <reference types="vitest" />
+import { defineConfig } from 'vite';
+
+import dts from 'vite-plugin-dts';
+import { join } from 'path';
+
+// eslint-disable-next-line @nx/enforce-module-boundaries
+import { viteTsConfigPaths } from '../../vite-ts-config-paths';
+
+export default defineConfig({
+	cacheDir: '../../../node_modules/.vite/php-wasm-logger',
+
+	plugins: [
+		dts({
+			entryRoot: 'src',
+			tsconfigPath: join(__dirname, 'tsconfig.lib.json'),
+		}),
+
+		viteTsConfigPaths({
+			root: '../../../',
+		}),
+	],
+
+	// Configuration for building your library.
+	// See: https://vitejs.dev/guide/build.html#library-mode
+	build: {
+		lib: {
+			// Could also be a dictionary or array of multiple entry points.
+			entry: 'src/index.ts',
+			name: 'php-wasm-logger',
+			fileName: 'index',
+			formats: ['es', 'cjs'],
+		},
+		rollupOptions: {
+			// External packages that should not be bundled into your library.
+			external: [],
+		},
+	},
+
+	test: {
+		globals: true,
+		cache: {
+			dir: '../../../node_modules/.vitest',
+		},
+		environment: 'jsdom',
+		include: ['src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
+	},
+});
diff --git a/packages/playground/client/src/index.ts b/packages/playground/client/src/index.ts
index a21632db13..52f0ea374f 100644
--- a/packages/playground/client/src/index.ts
+++ b/packages/playground/client/src/index.ts
@@ -38,7 +38,7 @@ import {
 import { consumeAPI } from '@php-wasm/web';
 import { ProgressTracker } from '@php-wasm/progress';
 import { PlaygroundClient } from '@wp-playground/remote';
-import { get_logger } from '@wp-playground/logger';
+import { getLogger } from '@php-wasm/logger';
 export interface StartPlaygroundOptions {
 	iframe: HTMLIFrameElement;
 	remoteUrl: string;
@@ -95,7 +95,7 @@ export async function startPlaygroundWeb({
 		}),
 		progressTracker
 	);
-	get_logger().addPlaygroundRequestEndListener(playground);
+	getLogger().addPlaygroundRequestEndListener(playground);
 	await runBlueprintSteps(compiled, playground);
 	progressTracker.finish();
 
diff --git a/packages/playground/node/src/index.ts b/packages/playground/node/src/index.ts
index 1503681be5..35da7236ee 100644
--- a/packages/playground/node/src/index.ts
+++ b/packages/playground/node/src/index.ts
@@ -13,6 +13,7 @@ import {
 } from '@wp-playground/blueprints';
 import { NodePHP } from '@php-wasm/node';
 import { UniversalPHP } from '@php-wasm/universal';
+import { getLogger } from '@php-wasm/logger';
 
 export interface NodePlaygroundOptions {
 	blueprint?: Blueprint;
@@ -43,6 +44,8 @@ export async function startPlaygroundNode(
 		},
 	});
 
+	getLogger().addPlaygroundRequestEndListener(playground);
+
 	await defineSiteUrl(playground, {
 		siteUrl: options.serverUrl,
 	});
diff --git a/tsconfig.base.json b/tsconfig.base.json
index f75342e2fb..8002cf9956 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -38,6 +38,9 @@
 			"@php-wasm/web-service-worker": [
 				"packages/php-wasm/web-service-worker/src/index.ts"
 			],
+			"@php-wasm/logger": [
+				"packages/php-wasm/logger/src/index.ts"
+			],
 			"@wp-playground/blueprints": [
 				"packages/playground/blueprints/src/index.ts"
 			],
@@ -63,10 +66,7 @@
 			],
 			"@wp-playground/wordpress": [
 				"packages/playground/wordpress/src/index.ts"
-			],
-			"@wp-playground/logger": [
-				"packages/playground/logger/logger.ts"
-			],
+			]
 		}
 	},
 	"exclude": ["node_modules", "tmp"]

From d0546aa221c0b3d448f083da904945640e17d39a Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Mon, 26 Feb 2024 16:24:16 +0100
Subject: [PATCH 26/30] Fix linter

---
 packages/php-wasm/logger/.eslintrc.json | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 packages/php-wasm/logger/.eslintrc.json

diff --git a/packages/php-wasm/logger/.eslintrc.json b/packages/php-wasm/logger/.eslintrc.json
new file mode 100644
index 0000000000..79fd7c1d98
--- /dev/null
+++ b/packages/php-wasm/logger/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+	"extends": ["../../../.eslintrc.json"],
+	"ignorePatterns": ["!**/*"],
+	"overrides": [
+		{
+			"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+			"rules": {}
+		},
+		{
+			"files": ["*.ts", "*.tsx"],
+			"rules": {}
+		},
+		{
+			"files": ["*.js", "*.jsx"],
+			"rules": {}
+		}
+	]
+}

From 1d840ed57134daf4c338bf85439a591ab4512477 Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Tue, 27 Feb 2024 06:41:47 +0100
Subject: [PATCH 27/30] Move logger code to main plugin file

---
 packages/php-wasm/logger/src/index.ts            |  2 +-
 .../lib/playground-mu-plugin/0-playground.php    | 16 +++++++++++-----
 .../playground-includes/playground_logger.php    |  9 ---------
 .../playground/remote/src/lib/worker-thread.ts   |  3 ---
 tsconfig.base.json                               |  4 +---
 5 files changed, 13 insertions(+), 21 deletions(-)
 delete mode 100644 packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php

diff --git a/packages/php-wasm/logger/src/index.ts b/packages/php-wasm/logger/src/index.ts
index 7754e4e2fb..1ff09efd40 100644
--- a/packages/php-wasm/logger/src/index.ts
+++ b/packages/php-wasm/logger/src/index.ts
@@ -1 +1 @@
-export * from './logger';
\ No newline at end of file
+export * from './logger';
diff --git a/packages/playground/remote/src/lib/playground-mu-plugin/0-playground.php b/packages/playground/remote/src/lib/playground-mu-plugin/0-playground.php
index 52b0c26502..1d1e73a93a 100644
--- a/packages/playground/remote/src/lib/playground-mu-plugin/0-playground.php
+++ b/packages/playground/remote/src/lib/playground-mu-plugin/0-playground.php
@@ -1,7 +1,4 @@
 <?php
-
-require(__DIR__ . '/playground-includes/playground_logger.php');
-
 /**
  * This is a temporary workaround to hide the 32bit integer warnings that
  * appear when using various time related function, such as strtotime and mktime.
@@ -144,7 +141,7 @@ function networking_disabled() {
 if (defined('USE_FETCH_FOR_REQUESTS') && USE_FETCH_FOR_REQUESTS) {
 	require(__DIR__ . '/playground-includes/wp_http_fetch.php');
 	// Force-replace the default WordPress requests transports with the Fetch transport.
-	// 
+	//
 	// WordPress doesn't provide a way to change the default transports,
 	// that is Curl and FSockopen. Even with all the `http_api_tranports`
 	// filter used below, WordPress tests if they are supported and will
@@ -192,4 +189,13 @@ function networking_disabled() {
 		$transports[] = 'Dummy';
 		return $transports;
 	});
-}
\ No newline at end of file
+}
+
+// Configure error logging
+$log_file = WP_CONTENT_DIR . '/debug.log';
+error_reporting(E_ALL);
+define('ERROR_LOG_FILE', $log_file);
+ini_set('error_log', $log_file);
+ini_set('ignore_repeated_errors', true);
+ini_set('display_errors', false);
+ini_set('log_errors', true);
diff --git a/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php b/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php
deleted file mode 100644
index 89c0fa4867..0000000000
--- a/packages/playground/remote/src/lib/playground-mu-plugin/playground-includes/playground_logger.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-// Configure error logging
-$log_file = WP_CONTENT_DIR . '/debug.log';
-error_reporting(E_ALL);
-define('ERROR_LOG_FILE', $log_file);
-ini_set('error_log', $log_file);
-ini_set('ignore_repeated_errors', true);
-ini_set('display_errors', false);
-ini_set('log_errors', true);
diff --git a/packages/playground/remote/src/lib/worker-thread.ts b/packages/playground/remote/src/lib/worker-thread.ts
index f44f58e3f2..498942d5b7 100644
--- a/packages/playground/remote/src/lib/worker-thread.ts
+++ b/packages/playground/remote/src/lib/worker-thread.ts
@@ -37,8 +37,6 @@ import transportFetch from './playground-mu-plugin/playground-includes/wp_http_f
 /** @ts-ignore */
 import transportDummy from './playground-mu-plugin/playground-includes/wp_http_dummy.php?raw';
 /** @ts-ignore */
-import playgroundLogger from './playground-mu-plugin/playground-includes/playground_logger.php?raw';
-/** @ts-ignore */
 import playgroundMuPlugin from './playground-mu-plugin/0-playground.php?raw';
 import { joinPaths, randomString } from '@php-wasm/util';
 
@@ -280,7 +278,6 @@ try {
 		'0-playground.php': playgroundMuPlugin,
 		'playground-includes/wp_http_dummy.php': transportDummy,
 		'playground-includes/wp_http_fetch.php': transportFetch,
-		'playground-includes/playground_logger.php': playgroundLogger,
 	});
 
 	if (virtualOpfsDir) {
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 8002cf9956..8e03cc971c 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -22,6 +22,7 @@
 			"@php-wasm/fs-journal": [
 				"packages/php-wasm/fs-journal/src/index.ts"
 			],
+			"@php-wasm/logger": ["packages/php-wasm/logger/src/index.ts"],
 			"@php-wasm/node": ["packages/php-wasm/node/src/index.ts"],
 			"@php-wasm/node-polyfills": [
 				"packages/php-wasm/node-polyfills/src/index.ts"
@@ -38,9 +39,6 @@
 			"@php-wasm/web-service-worker": [
 				"packages/php-wasm/web-service-worker/src/index.ts"
 			],
-			"@php-wasm/logger": [
-				"packages/php-wasm/logger/src/index.ts"
-			],
 			"@wp-playground/blueprints": [
 				"packages/playground/blueprints/src/index.ts"
 			],

From a3feb320d46d383c2b00ae0806b12faf347974a6 Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Wed, 28 Feb 2024 14:42:14 +0100
Subject: [PATCH 28/30] Attach JS logger in Website only

---
 packages/php-wasm/logger/src/logger.ts        | 300 ++++++++++--------
 packages/playground/client/src/index.ts       |   4 +-
 packages/playground/node/src/index.ts         |   4 +-
 .../components/playground-viewport/index.tsx  |   5 +
 4 files changed, 175 insertions(+), 138 deletions(-)

diff --git a/packages/php-wasm/logger/src/logger.ts b/packages/php-wasm/logger/src/logger.ts
index f33bdebce7..777edd1038 100644
--- a/packages/php-wasm/logger/src/logger.ts
+++ b/packages/php-wasm/logger/src/logger.ts
@@ -1,4 +1,4 @@
-import { UniversalPHP } from "@php-wasm/universal/src/lib/universal-php";
+import { UniversalPHP } from '@php-wasm/universal/src/lib/universal-php';
 /**
  * Log severity levels.
  */
@@ -8,149 +8,181 @@ export type LogSeverity = 'debug' | 'info' | 'warn' | 'error' | 'fatal';
  * A logger for Playground.
  */
 export class Logger {
-    private readonly LOG_PREFIX = 'Playground';
-
-    /**
-     * The length of the last PHP log.
-     */
-    private lastPHPLogLength = 0;
-
-    /**
-     * The path to the error log file.
-     */
-    private errorLogPath = '/wordpress/wp-content/debug.log';
-
-    constructor(errorLogPath?: string) {
-        if (errorLogPath) {
-            this.errorLogPath = errorLogPath;
-        }
-        this.collectJavaScriptErrors();
-    }
-
-    /**
-     * Collect errors from JavaScript window events like error and log them.
-     */
-    private collectJavaScriptErrors() {
-         if (typeof window !== 'undefined') {
-            window.addEventListener('error', (event) => {
-                this.log(
-                    `${event.message} in ${event.filename} on line ${event.lineno}:${event.colno}`,
-                    'fatal'
-                );
-            });
-            window.addEventListener('unhandledrejection', (event) => {
-                this.log(
-                    `${event.reason.stack}`,
-                    'fatal'
-                );
-            });
-            window.addEventListener('rejectionhandled', (event) => {
-                this.log(
-                    `${event.reason.stack}`,
-                    'fatal'
-                );
-            });
-        }
-    }
-
-    /**
-     * Read the WordPress debug.log file and return its content.
-     *
-     * @param UniversalPHP playground instance
-     * @returns string The content of the debug.log file
-     */
+	private readonly LOG_PREFIX = 'Playground';
+
+	/**
+	 * Whether the window events are connected.
+	 */
+	private windowConnected = false;
+
+	/**
+	 * The length of the last PHP log.
+	 */
+	private lastPHPLogLength = 0;
+
+	/**
+	 * The path to the error log file.
+	 */
+	private errorLogPath = '/wordpress/wp-content/debug.log';
+
+	constructor(errorLogPath?: string) {
+		if (errorLogPath) {
+			this.errorLogPath = errorLogPath;
+		}
+	}
+
+	/**
+	 * Read the WordPress debug.log file and return its content.
+	 *
+	 * @param UniversalPHP playground instance
+	 * @returns string The content of the debug.log file
+	 */
 	private async getRequestPhpErrorLog(playground: UniversalPHP) {
-		if (!await playground.fileExists(this.errorLogPath)) {
+		if (!(await playground.fileExists(this.errorLogPath))) {
 			return '';
 		}
 		return await playground.readFileAsText(this.errorLogPath);
 	}
-    /**
-     * Register a listener for the request.end event and log the data.
-     * @param UniversalPHP playground instance
-     */
-    public addPlaygroundRequestEndListener(playground: UniversalPHP) {
-        playground.addEventListener('request.end', async () => {
-            const log = await this.getRequestPhpErrorLog(playground);
-            if (log.length > this.lastPHPLogLength) {
-                this.logRaw(log.substring(this.lastPHPLogLength));
-                this.lastPHPLogLength = log.length;
-            }
-        } );
-    }
-
-
-    /**
-     * Get UTC date in the PHP log format https://github.com/php/php-src/blob/master/main/main.c#L849
-     *
-     * @param date
-     * @returns string
-     */
-    private formatLogDate(date: Date): string {
-        const formattedDate = new Intl.DateTimeFormat('en-GB', {
-            year: 'numeric',
-            month: 'short',
-            day: '2-digit',
-            timeZone: 'UTC',
-        }).format(date).replace(/ /g, '-');
-
-        const formattedTime = new Intl.DateTimeFormat('en-GB', {
-            hour: '2-digit',
-            minute: '2-digit',
-            second: '2-digit',
-            hour12: false,
-            timeZone: 'UTC',
-            timeZoneName: 'short'
-        }).format(date);
-        return formattedDate + ' ' + formattedTime;
-    }
-
-    /**
-     * Format log message and severity and log it.
-     * @param string message
-     * @param LogSeverity severity
-     */
-    public formatMessage(message: string, severity: LogSeverity): string {
-        const now = this.formatLogDate(new Date());
-        return `[${now}] ${this.LOG_PREFIX} ${severity}: ${message}`;
-    }
-
-    /**
-     * Log message with severity and timestamp.
-     * @param string message
-     * @param LogSeverity severity
-     */
-    public log(message: string, severity?: LogSeverity): void {
-        if (severity === undefined) {
-            severity = 'info';
-        }
-        const log = this.formatMessage(message, severity);
-        this.logRaw(log);
-    }
-
-    /**
-     * Log message without severity and timestamp.
-     * @param string log
-     */
-    public logRaw(log: string): void {
-        console.debug(log);
-    }
-};
+
+	/**
+	 * Log Windows errors.
+	 *
+	 * @param ErrorEvent event
+	 */
+	private logWindowError(event: ErrorEvent) {
+		this.log(
+			`${event.message} in ${event.filename} on line ${event.lineno}:${event.colno}`,
+			'fatal'
+		);
+	}
+
+	/**
+	 * Log unhandled promise rejections.
+	 *
+	 * @param PromiseRejectionEvent event
+	 */
+	private logUnhandledRejection(event: PromiseRejectionEvent) {
+		this.log(`${event.reason.stack}`, 'fatal');
+	}
+
+	/**
+	 * Register a listener for the window error events and log the data.
+	 */
+	public addWindowErrorListener() {
+		// Ensure that the window events are connected only once.
+		if (this.windowConnected) {
+			return;
+		}
+		if (typeof window === 'undefined') {
+			return;
+		}
+
+		window.addEventListener('error', this.logWindowError.bind(this));
+		window.addEventListener(
+			'unhandledrejection',
+			this.logUnhandledRejection.bind(this)
+		);
+		window.addEventListener(
+			'rejectionhandled',
+			this.logUnhandledRejection.bind(this)
+		);
+		this.windowConnected = true;
+	}
+
+	/**
+	 * Register a listener for the request.end event and log the data.
+	 * @param UniversalPHP playground instance
+	 */
+	public addPlaygroundRequestEndListener(playground: UniversalPHP) {
+		playground.addEventListener('request.end', async () => {
+			const log = await this.getRequestPhpErrorLog(playground);
+			if (log.length > this.lastPHPLogLength) {
+				this.logRaw(log.substring(this.lastPHPLogLength));
+				this.lastPHPLogLength = log.length;
+			}
+		});
+	}
+
+	/**
+	 * Get UTC date in the PHP log format https://github.com/php/php-src/blob/master/main/main.c#L849
+	 *
+	 * @param date
+	 * @returns string
+	 */
+	private formatLogDate(date: Date): string {
+		const formattedDate = new Intl.DateTimeFormat('en-GB', {
+			year: 'numeric',
+			month: 'short',
+			day: '2-digit',
+			timeZone: 'UTC',
+		})
+			.format(date)
+			.replace(/ /g, '-');
+
+		const formattedTime = new Intl.DateTimeFormat('en-GB', {
+			hour: '2-digit',
+			minute: '2-digit',
+			second: '2-digit',
+			hour12: false,
+			timeZone: 'UTC',
+			timeZoneName: 'short',
+		}).format(date);
+		return formattedDate + ' ' + formattedTime;
+	}
+
+	/**
+	 * Format log message and severity and log it.
+	 * @param string message
+	 * @param LogSeverity severity
+	 */
+	public formatMessage(message: string, severity: LogSeverity): string {
+		const now = this.formatLogDate(new Date());
+		return `[${now}] ${this.LOG_PREFIX} ${severity}: ${message}`;
+	}
+
+	/**
+	 * Log message with severity and timestamp.
+	 * @param string message
+	 * @param LogSeverity severity
+	 */
+	public log(message: string, severity?: LogSeverity): void {
+		if (severity === undefined) {
+			severity = 'info';
+		}
+		const log = this.formatMessage(message, severity);
+		this.logRaw(log);
+	}
+
+	/**
+	 * Log message without severity and timestamp.
+	 * @param string log
+	 */
+	public logRaw(log: string): void {
+		console.debug(log);
+	}
+}
 
 /**
  * The logger instance.
  */
-let logger: Logger | undefined = undefined;
+export const logger: Logger = new Logger();
+
+/**
+ * Collect errors from JavaScript window events like error and log them.
+ * @param loggerInstance The logger instance
+ */
+export function collectWindowErrors(loggerInstance: Logger) {
+	loggerInstance.addWindowErrorListener();
+}
 
 /**
- * Get the logger instance.
- *
- * @param errorLogPath The path to the error log file.
- * @returns Logger
+ * Collect PHP logs from the error_log file and log them.
+ * @param UniversalPHP playground instance
+ * @param loggerInstance The logger instance
  */
-export function getLogger(errorLogPath?: string): Logger {
-    if (!logger) {
-        logger = new Logger(errorLogPath);
-    }
-    return logger;
+export function collectPhpLogs(
+	loggerInstance: Logger,
+	playground: UniversalPHP
+) {
+	loggerInstance.addPlaygroundRequestEndListener(playground);
 }
diff --git a/packages/playground/client/src/index.ts b/packages/playground/client/src/index.ts
index 52f0ea374f..e5fc712f1f 100644
--- a/packages/playground/client/src/index.ts
+++ b/packages/playground/client/src/index.ts
@@ -38,7 +38,7 @@ import {
 import { consumeAPI } from '@php-wasm/web';
 import { ProgressTracker } from '@php-wasm/progress';
 import { PlaygroundClient } from '@wp-playground/remote';
-import { getLogger } from '@php-wasm/logger';
+import { collectPhpLogs, logger } from '@php-wasm/logger';
 export interface StartPlaygroundOptions {
 	iframe: HTMLIFrameElement;
 	remoteUrl: string;
@@ -95,7 +95,7 @@ export async function startPlaygroundWeb({
 		}),
 		progressTracker
 	);
-	getLogger().addPlaygroundRequestEndListener(playground);
+	collectPhpLogs(logger, playground);
 	await runBlueprintSteps(compiled, playground);
 	progressTracker.finish();
 
diff --git a/packages/playground/node/src/index.ts b/packages/playground/node/src/index.ts
index 35da7236ee..9fd9c8d4bd 100644
--- a/packages/playground/node/src/index.ts
+++ b/packages/playground/node/src/index.ts
@@ -13,7 +13,7 @@ import {
 } from '@wp-playground/blueprints';
 import { NodePHP } from '@php-wasm/node';
 import { UniversalPHP } from '@php-wasm/universal';
-import { getLogger } from '@php-wasm/logger';
+import { collectPhpLogs, logger } from '@php-wasm/logger';
 
 export interface NodePlaygroundOptions {
 	blueprint?: Blueprint;
@@ -44,7 +44,7 @@ export async function startPlaygroundNode(
 		},
 	});
 
-	getLogger().addPlaygroundRequestEndListener(playground);
+	collectPhpLogs(logger, playground);
 
 	await defineSiteUrl(playground, {
 		siteUrl: options.serverUrl,
diff --git a/packages/playground/website/src/components/playground-viewport/index.tsx b/packages/playground/website/src/components/playground-viewport/index.tsx
index eab29f19a6..715a3963ee 100644
--- a/packages/playground/website/src/components/playground-viewport/index.tsx
+++ b/packages/playground/website/src/components/playground-viewport/index.tsx
@@ -8,6 +8,7 @@ import { usePlayground } from '../../lib/hooks';
 import { StorageType } from '../../types';
 import PlaygroundContext from './context';
 import { logTrackingEvent } from '../../lib/tracking';
+import { collectWindowErrors, logger } from '@php-wasm/logger';
 
 export const supportedDisplayModes = [
 	'browser',
@@ -49,6 +50,10 @@ export default function PlaygroundViewport({
 		}
 	}, [blueprint?.steps]);
 
+	useEffect(() => {
+		collectWindowErrors(logger);
+	}, []);
+
 	return (
 		<PlaygroundContext.Provider
 			value={{

From ef4993bd967a47dfd80858a8e43f2f5cba6f8fef Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Wed, 28 Feb 2024 14:58:29 +0100
Subject: [PATCH 29/30] Revert compile error

---
 packages/playground/blueprints/src/lib/compile.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/playground/blueprints/src/lib/compile.ts b/packages/playground/blueprints/src/lib/compile.ts
index 1fb4da6ef5..f7a7d4a954 100644
--- a/packages/playground/blueprints/src/lib/compile.ts
+++ b/packages/playground/blueprints/src/lib/compile.ts
@@ -13,7 +13,7 @@ import type { SupportedPHPExtensionBundle } from '@php-wasm/universal';
 import { FileReference, isFileReference, Resource } from './resources';
 import { Step, StepDefinition } from './steps';
 import * as allStepHandlers from './steps/handlers';
-import { Blueprint } from './blueprint'
+import { Blueprint } from './blueprint';
 
 // @TODO: Configure this in the `wp-cli` step, not here.
 const { wpCLI, ...otherStepHandlers } = allStepHandlers;
@@ -237,9 +237,12 @@ export function compileBlueprint(
 						onStepCompleted(result, step);
 					} catch (e) {
 						console.error(e);
-						throw new Error(`Error when executing the blueprint step #${i} (${JSON.stringify(
-							step
-						)}) ${e instanceof Error ? `: ${e.message}` : e}`);
+						throw new Error(
+							`Error when executing the blueprint step #${i} (${JSON.stringify(
+								step
+							)}) ${e instanceof Error ? `: ${e.message}` : e}`,
+							{ cause: e }
+						);
 					}
 				}
 			} finally {

From 988a9a5aaececcd19fde79e88ccb72820fa9813b Mon Sep 17 00:00:00 2001
From: Bero <berislav.grgicak@gmail.com>
Date: Thu, 29 Feb 2024 08:29:15 +0100
Subject: [PATCH 30/30] Move window log collection to main

---
 .../website/src/components/playground-viewport/index.tsx   | 5 -----
 packages/playground/website/src/main.tsx                   | 7 ++++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/playground/website/src/components/playground-viewport/index.tsx b/packages/playground/website/src/components/playground-viewport/index.tsx
index 715a3963ee..eab29f19a6 100644
--- a/packages/playground/website/src/components/playground-viewport/index.tsx
+++ b/packages/playground/website/src/components/playground-viewport/index.tsx
@@ -8,7 +8,6 @@ import { usePlayground } from '../../lib/hooks';
 import { StorageType } from '../../types';
 import PlaygroundContext from './context';
 import { logTrackingEvent } from '../../lib/tracking';
-import { collectWindowErrors, logger } from '@php-wasm/logger';
 
 export const supportedDisplayModes = [
 	'browser',
@@ -50,10 +49,6 @@ export default function PlaygroundViewport({
 		}
 	}, [blueprint?.steps]);
 
-	useEffect(() => {
-		collectWindowErrors(logger);
-	}, []);
-
 	return (
 		<PlaygroundContext.Provider
 			value={{
diff --git a/packages/playground/website/src/main.tsx b/packages/playground/website/src/main.tsx
index 401384df73..c703e574ee 100644
--- a/packages/playground/website/src/main.tsx
+++ b/packages/playground/website/src/main.tsx
@@ -22,10 +22,11 @@ import { acquireOAuthTokenIfNeeded } from './github/acquire-oauth-token-if-neede
 import { GithubImportModal } from './github/github-import-form';
 import { GithubExportMenuItem } from './components/toolbar-buttons/github-export-menu-item';
 import { GithubExportModal } from './github/github-export-form';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { ExportFormValues } from './github/github-export-form/form';
 import { joinPaths } from '@php-wasm/util';
 import { PlaygroundContext } from './playground-context';
+import { collectWindowErrors, logger } from '@php-wasm/logger';
 
 const query = new URL(document.location.href).searchParams;
 const blueprint = await resolveBlueprint();
@@ -82,6 +83,10 @@ function Main() {
 		Partial<ExportFormValues>
 	>({});
 
+	useEffect(() => {
+		collectWindowErrors(logger);
+	}, []);
+
 	return (
 		<PlaygroundContext.Provider value={{ storage }}>
 			<PlaygroundViewport