@php-wasm/node 0.6.14 → 0.6.15

package/index.cjs

@@ -72377,10 +72377,13 @@ var PHPRequestHandler = class {
       isAbsolute ? void 0 : DEFAULT_BASE_URL
     );
     const normalizedRequestedPath = applyRewriteRules(
-      removePathPrefix(requestedUrl.pathname, this.#PATHNAME),
+      removePathPrefix(
+        decodeURIComponent(requestedUrl.pathname),
+        this.#PATHNAME
+      ),
       this.rewriteRules
     );
-    const fsPath = `${this.#DOCROOT}${normalizedRequestedPath}`;
+    const fsPath = joinPaths(this.#DOCROOT, normalizedRequestedPath);
     if (seemsLikeAPHPRequestHandlerPath(fsPath)) {
       return await this.#dispatchToPHP(request, requestedUrl);
     }
@@ -72459,7 +72462,9 @@ var PHPRequestHandler = class {
       }
       let scriptPath;
       try {
-        scriptPath = this.#resolvePHPFilePath(requestedUrl.pathname);
+        scriptPath = this.#resolvePHPFilePath(
+          decodeURIComponent(requestedUrl.pathname)
+        );
       } catch (error) {
         return new PHPResponse(
           404,
@@ -72929,15 +72934,11 @@ var BasePHP2 = class {
       }
       const response = await this.#handleRequest();
       if (response.exitCode !== 0) {
-        const output = {
-          stdout: response.text,
-          stderr: response.errors
-        };
-        console.warn(`PHP.run() output was:`, output);
+        console.warn(`PHP.run() output was:`, response.text);
         const error = new Error(
           `PHP.run() failed with exit code ${response.exitCode} and the following output: ` + response.errors
         );
-        error.output = output;
+        error.response = response;
         error.source = "request";
         console.error(error);
         throw error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/node",
-  "version": "0.6.14",
+  "version": "0.6.15",
   "description": "PHP.wasm for Node.js",
   "repository": {
     "type": "git",
@@ -28,18 +28,17 @@
   "license": "GPL-2.0-or-later",
   "main": "index.cjs",
   "types": "index.d.ts",
-  "gitHead": "83b6f8542937a9bea9ee6562887a511c20ac9442",
+  "gitHead": "e05126da329a26535905b0ab65415d20118f0197",
   "engines": {
-    "node": ">=18.18.2",
+    "node": ">=18.18.0",
     "npm": ">=8.11.0"
   },
   "dependencies": {
     "comlink": "^4.4.1",
-    "express": "4.18.2",
     "ws": "8.13.0",
     "yargs": "17.7.2",
-    "@php-wasm/node-polyfills": "0.6.14",
-    "@php-wasm/universal": "0.6.14",
-    "@php-wasm/util": "0.6.14"
+    "@php-wasm/node-polyfills": "0.6.15",
+    "@php-wasm/universal": "0.6.15",
+    "@php-wasm/util": "0.6.15"
   }
 }