@php-wasm/node 3.0.37 → 3.0.39

package/index.cjs

@@ -482,6 +482,7 @@ async function withXdebug(version = import_universal3.LatestSupportedPHPVersion,
 // packages/php-wasm/node/src/lib/extensions/intl/with-intl.ts
 var import_universal5 = require("@php-wasm/universal");
 var import_fs2 = __toESM(require("fs"), 1);
+var import_path = __toESM(require("path"), 1);
 
 // packages/php-wasm/node/src/lib/extensions/intl/get-intl-extension-module.ts
 var import_universal4 = require("@php-wasm/universal");
@@ -510,12 +511,14 @@ async function getIntlExtensionModule(version = import_universal4.LatestSupporte
 }
 
 // packages/php-wasm/node/src/lib/extensions/intl/with-intl.ts
+var import_meta = {};
 async function withIntl(version = import_universal5.LatestSupportedPHPVersion, options) {
   const extensionName = "intl.so";
   const extensionPath = await getIntlExtensionModule(version);
   const extension = import_fs2.default.readFileSync(extensionPath);
   const dataName = "icu.dat";
-  const dataPath = `${__dirname}/shared/${dataName}`;
+  const moduleDir = typeof __dirname !== "undefined" ? __dirname : import_meta.dirname;
+  const dataPath = import_path.default.join(moduleDir, "shared", dataName);
   const ICUData = import_fs2.default.readFileSync(dataPath);
   return {
     ...options,
@@ -570,7 +573,7 @@ async function withIntl(version = import_universal5.LatestSupportedPHPVersion, o
 
 // packages/php-wasm/node/src/lib/load-runtime.ts
 var import_util = require("@php-wasm/util");
-var import_path = require("path");
+var import_path2 = require("path");
 async function loadNodeRuntime(phpVersion, options = {}) {
   let emscriptenOptions = {
     /**
@@ -604,7 +607,7 @@ async function loadNodeRuntime(phpVersion, options = {}) {
                 phpRuntime.FS.mkdirTree(symlinkMountPath);
               } else if (sourceStat.isFile()) {
                 phpRuntime.FS.mkdirTree(
-                  (0, import_path.dirname)(symlinkMountPath)
+                  (0, import_path2.dirname)(symlinkMountPath)
                 );
                 phpRuntime.FS.writeFile(symlinkMountPath, "");
               } else {
@@ -657,14 +660,14 @@ var import_node_fs = require("node:fs");
 var import_universal7 = require("@php-wasm/universal");
 var import_util2 = require("@php-wasm/util");
 var import_fs4 = require("fs");
-var import_path2 = require("path");
+var import_path3 = require("path");
 function createNodeFsMountHandler(localPath) {
   return function(php, FS, vfsMountPoint) {
     let removeVfsNode = false;
     if (!import_universal7.FSHelpers.fileExists(FS, vfsMountPoint)) {
       const lstat = (0, import_fs4.lstatSync)(localPath);
       if (lstat.isFile() || lstat.isSymbolicLink()) {
-        FS.mkdirTree((0, import_path2.dirname)(vfsMountPoint));
+        FS.mkdirTree((0, import_path3.dirname)(vfsMountPoint));
         FS.writeFile(vfsMountPoint, "");
       } else if (lstat.isDirectory()) {
         FS.mkdirTree(vfsMountPoint);
@@ -723,15 +726,15 @@ function useHostFilesystem(php) {
   }
   php.chdir(process.cwd());
 }
-function statPathFollowSymlinks(path) {
-  let stat = (0, import_node_fs.lstatSync)(path);
+function statPathFollowSymlinks(path2) {
+  let stat = (0, import_node_fs.lstatSync)(path2);
   if (stat.isSymbolicLink()) {
     const fs4 = require("fs");
-    let target = path;
+    let target = path2;
     const seen = /* @__PURE__ */ new Set();
     while (true) {
       if (seen.has(target)) {
-        throw new Error(`Symlink loop detected: ${path}`);
+        throw new Error(`Symlink loop detected: ${path2}`);
       }
       seen.add(target);
       const linkStat = (0, import_node_fs.lstatSync)(target);
@@ -769,24 +772,24 @@ var FileLockManagerForNode = class {
    * @param op The whole file lock operation to perform.
    * @returns True if the lock was granted, false otherwise.
    */
-  lockWholeFile(path, op) {
-    if (this.locks.get(path) === void 0) {
+  lockWholeFile(path2, op) {
+    if (this.locks.get(path2) === void 0) {
       if (op.type === "unlock") {
         return true;
       }
       const maybeLock = FileLock.maybeCreate(
-        path,
+        path2,
         op.type,
         this.nativeFlockSync
       );
       if (maybeLock === void 0) {
         return false;
       }
-      this.locks.set(path, maybeLock);
+      this.locks.set(path2, maybeLock);
     }
-    const lock = this.locks.get(path);
+    const lock = this.locks.get(path2);
     const result = lock.lockWholeFile(op);
-    this.forgetPathIfUnlocked(path);
+    this.forgetPathIfUnlocked(path2);
     return result;
   }
   /**
@@ -797,22 +800,22 @@ var FileLockManagerForNode = class {
    * @param requestedLock The byte range lock to perform.
    * @returns True if the lock was granted, false otherwise.
    */
-  lockFileByteRange(path, requestedLock) {
-    if (!this.locks.has(path)) {
+  lockFileByteRange(path2, requestedLock) {
+    if (!this.locks.has(path2)) {
       if (requestedLock.type === "unlocked") {
         return true;
       }
       const maybeLock = FileLock.maybeCreate(
-        path,
+        path2,
         requestedLock.type,
         this.nativeFlockSync
       );
       if (maybeLock === void 0) {
         return false;
       }
-      this.locks.set(path, maybeLock);
+      this.locks.set(path2, maybeLock);
     }
-    const lock = this.locks.get(path);
+    const lock = this.locks.get(path2);
     return lock.lockFileByteRange(requestedLock);
   }
   /**
@@ -822,8 +825,8 @@ var FileLockManagerForNode = class {
    * @param desiredLock The desired byte range lock.
    * @returns The first conflicting byte range lock, or undefined if no conflicting lock exists.
    */
-  findFirstConflictingByteRangeLock(path, desiredLock) {
-    const lock = this.locks.get(path);
+  findFirstConflictingByteRangeLock(path2, desiredLock) {
+    const lock = this.locks.get(path2);
     if (lock === void 0) {
       return void 0;
     }
@@ -835,9 +838,9 @@ var FileLockManagerForNode = class {
    * @param pid The process ID to release locks for.
    */
   releaseLocksForProcess(pid) {
-    for (const [path, lock] of this.locks.entries()) {
+    for (const [path2, lock] of this.locks.entries()) {
       lock.releaseLocksForProcess(pid);
-      this.forgetPathIfUnlocked(path);
+      this.forgetPathIfUnlocked(path2);
     }
   }
   /**
@@ -860,14 +863,14 @@ var FileLockManagerForNode = class {
    *
    * @param path The path to the file to forget.
    */
-  forgetPathIfUnlocked(path) {
-    const lock = this.locks.get(path);
+  forgetPathIfUnlocked(path2) {
+    const lock = this.locks.get(path2);
     if (!lock) {
       return;
     }
     if (lock.isUnlocked()) {
       lock.dispose();
-      this.locks.delete(path);
+      this.locks.delete(path2);
     }
   }
 };
@@ -880,10 +883,10 @@ var FileLock = class _FileLock {
    * @param mode The type of lock to acquire
    * @returns A FileLock instance if the lock was acquired, undefined otherwise
    */
-  static maybeCreate(path, mode, nativeFlockSync) {
+  static maybeCreate(path2, mode, nativeFlockSync) {
     let fd;
     try {
-      fd = (0, import_fs5.openSync)(path, "a+");
+      fd = (0, import_fs5.openSync)(path2, "a+");
       const flockFlags = mode === "exclusive" ? "exnb" : "shnb";
       nativeFlockSync(fd, flockFlags);
       const nativeLock = { fd, mode, nativeFlockSync };

package/index.js

@@ -449,6 +449,7 @@ async function withXdebug(version = LatestSupportedPHPVersion3, options, xdebugO
 // packages/php-wasm/node/src/lib/extensions/intl/with-intl.ts
 import { LatestSupportedPHPVersion as LatestSupportedPHPVersion5, FSHelpers as FSHelpers2 } from "@php-wasm/universal";
 import fs2 from "fs";
+import path from "path";
 
 // packages/php-wasm/node/src/lib/extensions/intl/get-intl-extension-module.ts
 import { LatestSupportedPHPVersion as LatestSupportedPHPVersion4 } from "@php-wasm/universal";
@@ -482,7 +483,8 @@ async function withIntl(version = LatestSupportedPHPVersion5, options) {
   const extensionPath = await getIntlExtensionModule(version);
   const extension = fs2.readFileSync(extensionPath);
   const dataName = "icu.dat";
-  const dataPath = `${__dirname}/shared/${dataName}`;
+  const moduleDir = typeof __dirname !== "undefined" ? __dirname : import.meta.dirname;
+  const dataPath = path.join(moduleDir, "shared", dataName);
   const ICUData = fs2.readFileSync(dataPath);
   return {
     ...options,
@@ -692,15 +694,15 @@ function useHostFilesystem(php) {
   }
   php.chdir(process.cwd());
 }
-function statPathFollowSymlinks(path) {
-  let stat = lstatSync2(path);
+function statPathFollowSymlinks(path2) {
+  let stat = lstatSync2(path2);
   if (stat.isSymbolicLink()) {
     const fs4 = __require("fs");
-    let target = path;
+    let target = path2;
     const seen = /* @__PURE__ */ new Set();
     while (true) {
       if (seen.has(target)) {
-        throw new Error(`Symlink loop detected: ${path}`);
+        throw new Error(`Symlink loop detected: ${path2}`);
       }
       seen.add(target);
       const linkStat = lstatSync2(target);
@@ -738,24 +740,24 @@ var FileLockManagerForNode = class {
    * @param op The whole file lock operation to perform.
    * @returns True if the lock was granted, false otherwise.
    */
-  lockWholeFile(path, op) {
-    if (this.locks.get(path) === void 0) {
+  lockWholeFile(path2, op) {
+    if (this.locks.get(path2) === void 0) {
       if (op.type === "unlock") {
         return true;
       }
       const maybeLock = FileLock.maybeCreate(
-        path,
+        path2,
         op.type,
         this.nativeFlockSync
       );
       if (maybeLock === void 0) {
         return false;
       }
-      this.locks.set(path, maybeLock);
+      this.locks.set(path2, maybeLock);
     }
-    const lock = this.locks.get(path);
+    const lock = this.locks.get(path2);
     const result = lock.lockWholeFile(op);
-    this.forgetPathIfUnlocked(path);
+    this.forgetPathIfUnlocked(path2);
     return result;
   }
   /**
@@ -766,22 +768,22 @@ var FileLockManagerForNode = class {
    * @param requestedLock The byte range lock to perform.
    * @returns True if the lock was granted, false otherwise.
    */
-  lockFileByteRange(path, requestedLock) {
-    if (!this.locks.has(path)) {
+  lockFileByteRange(path2, requestedLock) {
+    if (!this.locks.has(path2)) {
       if (requestedLock.type === "unlocked") {
         return true;
       }
       const maybeLock = FileLock.maybeCreate(
-        path,
+        path2,
         requestedLock.type,
         this.nativeFlockSync
       );
       if (maybeLock === void 0) {
         return false;
       }
-      this.locks.set(path, maybeLock);
+      this.locks.set(path2, maybeLock);
     }
-    const lock = this.locks.get(path);
+    const lock = this.locks.get(path2);
     return lock.lockFileByteRange(requestedLock);
   }
   /**
@@ -791,8 +793,8 @@ var FileLockManagerForNode = class {
    * @param desiredLock The desired byte range lock.
    * @returns The first conflicting byte range lock, or undefined if no conflicting lock exists.
    */
-  findFirstConflictingByteRangeLock(path, desiredLock) {
-    const lock = this.locks.get(path);
+  findFirstConflictingByteRangeLock(path2, desiredLock) {
+    const lock = this.locks.get(path2);
     if (lock === void 0) {
       return void 0;
     }
@@ -804,9 +806,9 @@ var FileLockManagerForNode = class {
    * @param pid The process ID to release locks for.
    */
   releaseLocksForProcess(pid) {
-    for (const [path, lock] of this.locks.entries()) {
+    for (const [path2, lock] of this.locks.entries()) {
       lock.releaseLocksForProcess(pid);
-      this.forgetPathIfUnlocked(path);
+      this.forgetPathIfUnlocked(path2);
     }
   }
   /**
@@ -829,14 +831,14 @@ var FileLockManagerForNode = class {
    *
    * @param path The path to the file to forget.
    */
-  forgetPathIfUnlocked(path) {
-    const lock = this.locks.get(path);
+  forgetPathIfUnlocked(path2) {
+    const lock = this.locks.get(path2);
     if (!lock) {
       return;
     }
     if (lock.isUnlocked()) {
       lock.dispose();
-      this.locks.delete(path);
+      this.locks.delete(path2);
     }
   }
 };
@@ -849,10 +851,10 @@ var FileLock = class _FileLock {
    * @param mode The type of lock to acquire
    * @returns A FileLock instance if the lock was acquired, undefined otherwise
    */
-  static maybeCreate(path, mode, nativeFlockSync) {
+  static maybeCreate(path2, mode, nativeFlockSync) {
     let fd;
     try {
-      fd = openSync(path, "a+");
+      fd = openSync(path2, "a+");
       const flockFlags = mode === "exclusive" ? "exnb" : "shnb";
       nativeFlockSync(fd, flockFlags);
       const nativeLock = { fd, mode, nativeFlockSync };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@php-wasm/node",
-  "version": "3.0.37",
+  "version": "3.0.39",
   "description": "PHP.wasm for Node.js",
   "repository": {
     "type": "git",
@@ -38,7 +38,7 @@
   },
   "license": "GPL-2.0-or-later",
   "types": "index.d.ts",
-  "gitHead": "1ac56b78f05f1c517f6b56beb527d6826b53aa82",
+  "gitHead": "ba92e55e300abaadb95b3a89e598af2cd6676951",
   "engines": {
     "node": ">=20.18.3",
     "npm": ">=10.1.0"
@@ -49,20 +49,20 @@
     "wasm-feature-detect": "1.8.0",
     "ws": "8.18.3",
     "yargs": "17.7.2",
-    "@php-wasm/node-polyfills": "3.0.37",
-    "@php-wasm/universal": "3.0.37",
-    "@php-wasm/node-8-5": "3.0.37",
-    "@php-wasm/node-8-4": "3.0.37",
-    "@php-wasm/node-8-3": "3.0.37",
-    "@php-wasm/node-8-2": "3.0.37",
-    "@php-wasm/node-8-1": "3.0.37",
-    "@php-wasm/node-8-0": "3.0.37",
-    "@php-wasm/node-7-4": "3.0.37",
-    "@php-wasm/node-7-3": "3.0.37",
-    "@php-wasm/node-7-2": "3.0.37",
-    "@php-wasm/logger": "3.0.37",
-    "@php-wasm/util": "3.0.37",
-    "@wp-playground/common": "3.0.37"
+    "@php-wasm/node-polyfills": "3.0.39",
+    "@php-wasm/universal": "3.0.39",
+    "@php-wasm/node-8-5": "3.0.39",
+    "@php-wasm/node-8-4": "3.0.39",
+    "@php-wasm/node-8-3": "3.0.39",
+    "@php-wasm/node-8-2": "3.0.39",
+    "@php-wasm/node-8-1": "3.0.39",
+    "@php-wasm/node-8-0": "3.0.39",
+    "@php-wasm/node-7-4": "3.0.39",
+    "@php-wasm/node-7-3": "3.0.39",
+    "@php-wasm/node-7-2": "3.0.39",
+    "@php-wasm/logger": "3.0.39",
+    "@php-wasm/util": "3.0.39",
+    "@wp-playground/common": "3.0.39"
   },
   "packageManager": "npm@10.9.2",
   "overrides": {