Playground CLI

bunfig.toml

@@ -0,0 +1 @@
+preload = ["./packages/bun-extensions/src/import-files-as-text.ts"]

lerna.json

@@ -1,6 +1,6 @@
 {
 	"$schema": "node_modules/lerna/schemas/lerna-schema.json",
 	"useWorkspaces": true,
-	"version": "0.7.1",
+	"version": "0.7.2",
 	"useNx": true
 }

packages/bun-extensions/src/import-files-as-text.ts

@@ -0,0 +1,33 @@
+import { plugin, BunPlugin } from 'bun';
+
+/**
+ * Adds support for `import contents from "file.php?raw"`.
+ *
+ * It matches Vite's behavior, which is to read the file as text
+ * and return its textual content. This allows us to run Bun and
+ * Vite on the same codebase.
+ */
+export const ImportFilesAsTextPlugin: BunPlugin = {
+	name: 'ImportFilesAsTextPlugin',
+	setup(build) {
+		build.onLoad(
+			{
+				// Looks for paths with a `raw` query parameter.
+				filter: /[?&]raw(?:[&=]|$)/,
+			},
+			async (args) => {
+				const path = args.path.split('?')[0];
+				// Use Bun.file to read the .php file as text
+				const text = await Bun.file(path).text();
+
+				// Return the file content as a module exporting the text
+				return {
+					contents: `export default ${JSON.stringify(text)};`,
+					loader: 'js', // Treat the content as JavaScript
+				};
+			}
+		);
+	},
+};
+
+plugin(ImportFilesAsTextPlugin);

packages/php-wasm/cli/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@php-wasm/cli",
-	"version": "0.7.1",
+	"version": "0.7.2",
 	"description": "PHP.wasm CLI for node.js",
 	"repository": {
 		"type": "git",

packages/php-wasm/compile/php/Dockerfile

@@ -1023,11 +1023,7 @@ RUN set -euxo pipefail; \
 	# Turn the php.js file into an ES module
 		# Manually turn the output into a esm module instead of relying on -s MODULARIZE=1.
 		# which pollutes the global namespace and does not play well with import() mechanics.
-		if [ "$EMSCRIPTEN_ENVIRONMENT" = "node" ]; then \
-			echo "const dependencyFilename = __dirname + '/${PHP_VERSION_ESCAPED}/$WASM_FILENAME'; " >> /root/output/php-module.js; \
-		else \
-			echo "import dependencyFilename from './${PHP_VERSION_ESCAPED}/$WASM_FILENAME'; " >> /root/output/php-module.js; \
-		fi; \
+		echo "import dependencyFilename from './${PHP_VERSION_ESCAPED}/$WASM_FILENAME'; " >> /root/output/php-module.js; \
 		echo "export { dependencyFilename }; " >> /root/output/php-module.js && \
 		echo "export const dependenciesTotalSize = $FILE_SIZE; " >> /root/output/php-module.js && \
 		cat /root/esm-prefix.js >> /root/output/php-module.js && \

packages/php-wasm/fs-journal/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@php-wasm/fs-journal",
-	"version": "0.7.1",
+	"version": "0.7.2",
 	"description": "Bindings to journal the PHP filesystem",
 	"repository": {
 		"type": "git",

packages/php-wasm/fs-journal/vite.config.ts

@@ -7,6 +7,9 @@ import { join } from 'path';
 // eslint-disable-next-line @nx/enforce-module-boundaries
 import { viteTsConfigPaths } from '../../vite-ts-config-paths';
 
+// eslint-disable-next-line @nx/enforce-module-boundaries
+import { viteWasmLoader } from '../../vite-wasm-loader';
+
 export default defineConfig({
 	cacheDir: '../../../node_modules/.vite/php-wasm-fs-journal',
 
@@ -19,6 +22,8 @@ export default defineConfig({
 		viteTsConfigPaths({
 			root: '../../../',
 		}),
+
+		viteWasmLoader,
 	],
 
 	// Configuration for building your library.

packages/php-wasm/logger/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@php-wasm/logger",
-	"version": "0.7.1",
+	"version": "0.7.2",
 	"description": "A logger for PHP-wasm clients like Playground and WP-now.",
 	"repository": {
 		"type": "git",
@@ -19,7 +19,8 @@
 		"directory": "../../../dist/packages/php-wasm/logger"
 	},
 	"license": "GPL-2.0-or-later",
-	"main": "index.cjs",
+	"type": "module",
+	"main": "index.js",
 	"types": "index.d.ts",
 	"engines": {
 		"node": ">=18.18.0",

packages/php-wasm/node-polyfills/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@php-wasm/node-polyfills",
-	"version": "0.7.1",
+	"version": "0.7.2",
 	"description": "PHP.wasm – polyfills for Node.js",
 	"repository": {
 		"type": "git",

packages/php-wasm/node/bin/postprocess-php-modules.cjs

@@ -0,0 +1,37 @@
+/**
+ * Replaces `import dependencyFilename from ` with `const dependencyFilename = __dirName + `
+ * in all files matching glob `php_*.js` in directory specified by argv[0].
+ *
+ * We need this to:
+ *
+ * * Produce a CommonJS and ESM-compliant module using Vite
+ * * Make the uncompiled source compatible with Bun
+ */
+const fs = require('fs');
+const glob = require('glob');
+
+const directory = process.argv[2];
+
+const files = glob.globSync(`${directory}/php_*.js`);
+files.forEach((file) => {
+	fs.readFile(file, 'utf8', (err, data) => {
+		if (err) {
+			console.error(err);
+			return;
+		}
+
+		const updatedData = data.replace(
+			'import dependencyFilename from ',
+			'const dependencyFilename = __dirname + '
+		);
+
+		fs.writeFile(file, updatedData, 'utf8', (err) => {
+			if (err) {
+				console.error(err);
+				return;
+			}
+
+			console.log(`Updated file: ${file}`);
+		});
+	});
+});

packages/php-wasm/node/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@php-wasm/node",
-	"version": "0.7.1",
+	"version": "0.7.2",
 	"description": "PHP.wasm for Node.js",
 	"repository": {
 		"type": "git",

packages/php-wasm/node/project.json

@@ -22,7 +22,9 @@
 			"executor": "nx:run-commands",
 			"options": {
 				"commands": [
-					"cp -rf packages/php-wasm/node/public/* dist/packages/php-wasm/node"
+					"cp -rf packages/php-wasm/node/public/* dist/packages/php-wasm/node",
+					"node packages/php-wasm/node/bin/postprocess-php-modules.cjs dist/packages/php-wasm/node",
+					"rm -rf dist/packages/php-wasm/node/*.wasm"
 				],
 				"parallel": false
 			},

packages/php-wasm/node/public/php_7_0.js

@@ -1,4 +1,4 @@
-const dependencyFilename = __dirname + '/7_0_33/php_7_0.wasm'; 
+import dependencyFilename from './7_0_33/php_7_0.wasm'; 
 export { dependencyFilename }; 
 export const dependenciesTotalSize = 13118939; 
 export function init(RuntimeName, PHPLoader) {

packages/php-wasm/node/public/php_7_1.js

@@ -1,4 +1,4 @@
-const dependencyFilename = __dirname + '/7_1_30/php_7_1.wasm'; 
+import dependencyFilename from './7_1_30/php_7_1.wasm';
 export { dependencyFilename }; 
 export const dependenciesTotalSize = 13643181; 
 export function init(RuntimeName, PHPLoader) {

packages/php-wasm/node/public/php_7_2.js

@@ -1,4 +1,4 @@
-const dependencyFilename = __dirname + '/7_2_34/php_7_2.wasm'; 
+import dependencyFilename from './7_2_34/php_7_2.wasm'; 
 export { dependencyFilename }; 
 export const dependenciesTotalSize = 14335706; 
 export function init(RuntimeName, PHPLoader) {

packages/php-wasm/node/public/php_7_3.js

@@ -1,4 +1,4 @@
-const dependencyFilename = __dirname + '/7_3_33/php_7_3.wasm'; 
+import dependencyFilename from './7_3_33/php_7_3.wasm'; 
 export { dependencyFilename }; 
 export const dependenciesTotalSize = 14441796; 
 export function init(RuntimeName, PHPLoader) {

packages/php-wasm/node/public/php_7_4.js

@@ -1,4 +1,4 @@
-const dependencyFilename = __dirname + '/7_4_33/php_7_4.wasm'; 
+import dependencyFilename from './7_4_33/php_7_4.wasm';
 export { dependencyFilename }; 
 export const dependenciesTotalSize = 14675209; 
 export function init(RuntimeName, PHPLoader) {

packages/php-wasm/node/public/php_8_0.js

@@ -1,4 +1,4 @@
-const dependencyFilename = __dirname + '/8_0_30/php_8_0.wasm'; 
+import dependencyFilename from './8_0_30/php_8_0.wasm'; 
 export { dependencyFilename }; 
 export const dependenciesTotalSize = 13904218; 
 export function init(RuntimeName, PHPLoader) {

packages/php-wasm/node/public/php_8_1.js

@@ -1,4 +1,4 @@
-const dependencyFilename = __dirname + '/8_1_23/php_8_1.wasm'; 
+import dependencyFilename from './8_1_23/php_8_1.wasm'; 
 export { dependencyFilename }; 
 export const dependenciesTotalSize = 13884035; 
 export function init(RuntimeName, PHPLoader) {

packages/php-wasm/node/public/php_8_2.js

@@ -1,4 +1,4 @@
-const dependencyFilename = __dirname + '/8_2_10/php_8_2.wasm'; 
+import dependencyFilename from './8_2_10/php_8_2.wasm'; 
 export { dependencyFilename }; 
 export const dependenciesTotalSize = 14143340; 
 export function init(RuntimeName, PHPLoader) {

packages/php-wasm/node/public/php_8_3.js

@@ -1,4 +1,4 @@
-const dependencyFilename = __dirname + '/8_3_0/php_8_3.wasm'; 
+import dependencyFilename from './8_3_0/php_8_3.wasm'; 
 export { dependencyFilename }; 
 export const dependenciesTotalSize = 14523141; 
 export function init(RuntimeName, PHPLoader) {

packages/php-wasm/node/src/lib/networking/outbound-ws-to-tcp-proxy.ts

@@ -118,7 +118,7 @@ export function initOutboundWebsocketProxyServer(
 
 // Handle new WebSocket client
 async function onWsConnect(client: any, request: http.IncomingMessage) {
-	const clientAddr = client._socket.remoteAddress;
+	const clientAddr = client?._socket?.remoteAddress || client.url;
 	const clientLog = function (...args: any[]) {
 		log(' ' + clientAddr + ': ', ...args);
 	};

packages/php-wasm/node/src/lib/node-php.ts

@@ -104,7 +104,12 @@ export class NodePHP extends BasePHP {
 	 */
 	@rethrowFileSystemError('Could not mount {path}')
 	mount(localPath: string | MountSettings, virtualFSPath: string) {
-		if (!this.fileExists(virtualFSPath)) {
+		const localRoot =
+			typeof localPath === 'object' ? localPath.root : localPath;
+		if (
+			!this.fileExists(virtualFSPath) &&
+			lstatSync(localRoot).isDirectory()
+		) {
 			this.mkdirTree(virtualFSPath);
 		}
 		this[__private__dont__use].FS.mount(