@wp-playground/blueprints 0.6.8 → 0.6.9

package/index.d.ts

@@ -193,6 +193,7 @@ export interface PHPRequestEndEvent {
 export interface PHPRequestErrorEvent {
 	type: "request.error";
 	error: Error;
+	source?: "request" | "php-wasm";
 }
 /**
  * Represents a PHP runtime initialization event.
@@ -658,11 +659,6 @@ export interface PHPRunOptions {
 	 * The code snippet to eval instead of a php file.
 	 */
 	code?: string;
-	/**
-	 * Whether to throw an error if the PHP process exits with a non-zero code
-	 * or outputs to stderr.
-	 */
-	throwOnError?: boolean;
 }
 export interface RmDirOptions {
 	/**
@@ -1648,7 +1644,7 @@ export declare const enableMultisite: StepHandler<EnableMultisiteStep>;
  *
  * <code>
  * {
- * 		"step": "wpCLI",
+ * 		"step": "wp-cli",
  * 		"command": "wp post create --post_title='Test post' --post_excerpt='Some content'"
  * }
  * </code>

package/index.js

@@ -269,7 +269,6 @@ const activatePlugin = async (e, { pluginPath: t, pluginName: r }, n) => {
   n == null || n.tracker.setCaption(`Activating ${r || t}`);
   const s = await e.documentRoot;
   await e.run({
-    throwOnError: !0,
     code: `<?php
 define( 'WP_ADMIN', true );
 require_once( ${phpVar(s)}. "/wp-load.php" );
@@ -301,7 +300,6 @@ exit(1);
   r == null || r.tracker.setCaption(`Activating ${t}`);
   const n = await e.documentRoot;
   await e.run({
-    throwOnError: !0,
     code: `<?php
 define( 'WP_ADMIN', true );
 require_once( ${phpVar(n)}. "/wp-load.php" );
@@ -312,7 +310,7 @@ set_current_user( get_users(array('role' => 'Administrator') )[0] );
 switch_theme( ${phpVar(t)} );
 `
   });
-}, runPHP = async (e, { code: t }) => await e.run({ code: t, throwOnError: !0 }), runPHPWithOptions = async (e, { options: t }) => await e.run(t), rm = async (e, { path: t }) => {
+}, runPHP = async (e, { code: t }) => await e.run({ code: t }), runPHPWithOptions = async (e, { options: t }) => await e.run(t), rm = async (e, { path: t }) => {
   await e.unlink(t);
 }, runSql = async (e, { sql: t }, r) => {
   r == null || r.tracker.setCaption("Executing SQL Queries");
@@ -712,7 +710,6 @@ async function rewriteDefineCalls(e, t, r) {
     consts: r
   });
   return await e.run({
-    throwOnError: !0,
     code: `${rewriteWpConfigToDefineConstants}
 	$wp_config_path = '/tmp/code.php';
 	$wp_config = file_get_contents($wp_config_path);
@@ -745,7 +742,6 @@ const login = async (e, { username: t = "admin", password: r = "password" } = {}
 }, setSiteOptions = async (e, { options: t }) => {
   const r = await e.documentRoot;
   await e.run({
-    throwOnError: !0,
     code: `<?php
 		include ${phpVar(r)} . '/wp-load.php';
 		$site_options = ${phpVar(t)};
@@ -758,7 +754,6 @@ const login = async (e, { username: t = "admin", password: r = "password" } = {}
 }, updateUserMeta = async (e, { meta: t, userId: r }) => {
   const n = await e.documentRoot;
   await e.run({
-    throwOnError: !0,
     code: `<?php
 		include ${phpVar(n)} . '/wp-load.php';
 		$meta = ${phpVar(t)};
@@ -794,7 +789,6 @@ const enableMultisite = async (e) => {
     }
   }), await login(e, {});
   const s = await e.documentRoot, o = (await e.run({
-    throwOnError: !0,
     code: `<?php
 define( 'WP_ADMIN', true );
 require_once(${phpVar(s)} . "/wp-load.php");
@@ -1035,7 +1029,6 @@ function delTree($dir)
 `;
 async function runPhpWithZipFunctions(e, t) {
   return await e.run({
-    throwOnError: !0,
     code: zipFunctions + t
   });
 }
@@ -1101,7 +1094,6 @@ const tmpPath = "/tmp/file.zip", unzip = async (e, { zipFile: t, zipPath: r, ext
     joinPaths(n, "wp-admin", "upgrade.php")
   );
   await e.run({
-    throwOnError: !0,
     code: `<?php
             $_GET['step'] = 'upgrade_db';
             require ${u};
@@ -1942,7 +1934,8 @@ class PHPRequestHandler {
   /** @inheritDoc */
   async request(t) {
     const r = t.url.startsWith("http://") || t.url.startsWith("https://"), n = new URL(
-      t.url,
+      // Remove the hash part of the URL as it's not meant for the server.
+      t.url.split("#")[0],
       r ? void 0 : DEFAULT_BASE_URL
     ), s = applyRewriteRules(
       removePathPrefix(n.pathname, H(this, ve)),
@@ -2353,7 +2346,7 @@ class BasePHP {
       for (const l in i)
         ce(this, Tt, rr).call(this, l, i[l]);
       const o = await ce(this, Ot, sr).call(this);
-      if (e.throwOnError && o.exitCode !== 0) {
+      if (o.exitCode !== 0) {
         const l = {
           stdout: o.text,
           stderr: o.errors
@@ -2362,13 +2355,15 @@ class BasePHP {
         const d = new Error(
           `PHP.run() failed with exit code ${o.exitCode} and the following output: ` + o.errors
         );
-        throw d.output = l, console.error(d), d;
+        throw d.output = l, d.source = "request", console.error(d), d;
       }
       return o;
     } catch (n) {
       throw this.dispatchEvent({
         type: "request.error",
-        error: n
+        error: n,
+        // Distinguish between PHP request and PHP-wasm errors
+        source: n.source ?? "php-wasm"
       }), n;
     } finally {
       try {
@@ -9182,10 +9177,6 @@ for existing apps using this option.`
       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: !1

package/lib/steps/wp-cli.d.ts

@@ -7,7 +7,7 @@ import { StepHandler } from '.';
  *
  * <code>
  * {
- * 		"step": "wpCLI",
+ * 		"step": "wp-cli",
  * 		"command": "wp post create --post_title='Test post' --post_excerpt='Some content'"
  * }
  * </code>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@wp-playground/blueprints",
-	"version": "0.6.8",
+	"version": "0.6.9",
 	"exports": {
 		".": {
 			"import": "./index.js",
@@ -21,7 +21,7 @@
 		"access": "public",
 		"directory": "../../../dist/packages/playground/blueprints"
 	},
-	"gitHead": "cb7b1af260489022238495a2fc0d96f767a1294a",
+	"gitHead": "f6b98ad6d05617ee8cb1234c21318fdde17a6e56",
 	"engines": {
 		"node": ">=18.18.2",
 		"npm": ">=8.11.0"

package/schema-readme.md

@@ -5,5 +5,5 @@ Whenever the types are modified, the schema needs to be rebuilt using
 `nx build playground-blueprints` and then committed to the repository.
 
 Unfortunately, it is not auto-rebuilt in `npm run dev` mode as the
-`dts-bundle-generator` utility we use for type rollyps does not support
+`dts-bundle-generator` utility we use for type rollups does not support
 watching for changes.