Don't create directories manually before mounting to NODEFS

Author: bgrgicak

packages/php-wasm/node/src/test/php.spec.ts

@@ -868,27 +868,27 @@ describe.each(phpVersions)('PHP %s', (phpVersion) => {
 				1 => array("pipe","w")
 			);
 			$proc = proc_open( "fetch", $descriptorspec, $pipes );
-			
+
 			// Make the stream non-blocking
 			stream_set_blocking($pipes[1], false);
-			
+
 			// First read should get initial data immediately
 			$data1 = fread($pipes[1], 1024);
 			echo "First read: " . json_encode($data1) . "\\n";
-			
+
 			// Second read should return empty string immediately (non-blocking)
 			$data2 = fread($pipes[1], 1024);
 			echo "Second read (immediate): " . json_encode($data2) . "\\n";
-			
+
 			// Wait a bit and try again - should get the delayed data
 			sleep(1);
 			$data3 = fread($pipes[1], 1024);
 			echo "Third read (after delay): " . json_encode($data3) . "\\n";
-			
+
 			// Fourth read should be empty again
 			$data4 = fread($pipes[1], 1024);
 			echo "Fourth read: " . json_encode($data4) . "\\n";
-			
+
 			proc_close( $proc );
 			`,
 			});
@@ -927,14 +927,14 @@ describe.each(phpVersions)('PHP %s', (phpVersion) => {
 				1 => array("pipe","w")
 			);
 			$proc = proc_open( "fetch", $descriptorspec, $pipes );
-			
+
 			// Make the stream non-blocking
 			stream_set_blocking($pipes[1], false);
-			
+
 			$chunks = array();
 			$attempts = 0;
 			$maxAttempts = 20;
-			
+
 			// Poll until we get all data or reach max attempts
 			while ($attempts < $maxAttempts && !feof($pipes[1])) {
 				$data = fread($pipes[1], 1024);
@@ -947,10 +947,10 @@ describe.each(phpVersions)('PHP %s', (phpVersion) => {
 				$attempts++;
 				usleep(100000); // 100ms between attempts
 			}
-			
+
 			echo "Total chunks received: " . count($chunks) . "\\n";
 			echo "Combined data: " . json_encode(implode("", $chunks)) . "\\n";
-			
+
 			proc_close( $proc );
 			`,
 			});
@@ -1395,7 +1395,6 @@ describe.each(phpVersions)('PHP %s', (phpVersion) => {
 				__dirname + '/test-data/mount-contents/a/b/test.txt',
 				'contents'
 			);
-			php.mkdir('/nodefs');
 			php.mount(
 				'/nodefs',
 				createNodeFsMountHandler(
@@ -1430,7 +1429,6 @@ describe.each(phpVersions)('PHP %s', (phpVersion) => {
 		});
 
 		it('mv() from MEMFS to NODEFS should work', () => {
-			php.mkdir('/nodefs');
 			php.mount(
 				'/nodefs',
 				createNodeFsMountHandler(

packages/php-wasm/node/src/test/rotate-php-runtime.spec.ts

@@ -68,7 +68,6 @@ describe('rotatePHPRuntime()', () => {
 		fs.writeFileSync(tempFile, 'playground');
 
 		// Mount the temporary directory
-		php.mkdir('/test-root');
 		await php.mount('/test-root', createNodeFsMountHandler(tempDir));
 
 		// Confirm the file is still there
@@ -112,14 +111,6 @@ describe('rotatePHPRuntime()', () => {
 			fs.writeFileSync(path.join(dir, 'test.php'), `plugin-${i}`);
 		});
 
-		// Create WordPress directory structure
-		php.mkdir('/wordpress/wp-content/plugins/data-liberation');
-		php.mkdir('/wordpress/wp-content/plugins/z-data-liberation-markdown');
-		php.mkdir(
-			'/wordpress/wp-content/plugins/z-data-liberation-static-files-editor'
-		);
-		php.mkdir('/wordpress/wp-content/uploads/static-pages');
-
 		// Mount the directories using WordPress paths
 		await php.mount(
 			'/wordpress/wp-content/plugins/data-liberation',
@@ -416,7 +407,6 @@ describe('rotatePHPRuntime()', () => {
 
 		php.mkdir('/test-root');
 		php.writeFile('/test-root/index.php', 'test');
-		php.mkdir('/test-root/nodefs');
 
 		const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'temp-'));
 		const tempFile = path.join(tempDir, 'file');

packages/php-wasm/node/src/test/symlinks.spec.ts

@@ -60,7 +60,6 @@ testSymlinks.forEach(({ name, sourcePath, symlinkPath }) => {
 				);
 			}
 
-			await php.mkdir('/folder-with-symlinks');
 			await php.mount(
 				'/folder-with-symlinks',
 				createNodeFsMountHandler(

packages/playground/cli/src/mounts.ts

@@ -80,7 +80,6 @@ export function parseMountDirArguments(mounts: string[]): Mount[] {
 
 export async function mountResources(php: PHP, mounts: Mount[]) {
 	for (const mount of mounts) {
-		php.mkdir(mount.vfsPath);
 		await php.mount(
 			mount.vfsPath,
 			createNodeFsMountHandler(mount.hostPath)

packages/playground/cli/src/worker-thread.ts

@@ -1,7 +1,7 @@
 import type { FileLockManager } from '@php-wasm/node';
-import { createNodeFsMountHandler, loadNodeRuntime } from '@php-wasm/node';
+import { loadNodeRuntime } from '@php-wasm/node';
 import { EmscriptenDownloadMonitor } from '@php-wasm/progress';
-import type { PHP, RemoteAPI, SupportedPHPVersion } from '@php-wasm/universal';
+import type { RemoteAPI, SupportedPHPVersion } from '@php-wasm/universal';
 import {
 	PHPWorker,
 	consumeAPI,
@@ -14,6 +14,7 @@ import { bootWordPress } from '@wp-playground/wordpress';
 import { rootCertificates } from 'tls';
 import { jspi } from 'wasm-feature-detect';
 import { MessageChannel, type MessagePort, parentPort } from 'worker_threads';
+import { mountResources } from './mounts';
 
 export interface Mount {
 	hostPath: string;
@@ -43,13 +44,6 @@ export type PrimaryWorkerBootOptions = {
 	internalCookieStore?: boolean;
 };
 
-function mountResources(php: PHP, mounts: Mount[]) {
-	for (const mount of mounts) {
-		php.mkdir(mount.vfsPath);
-		php.mount(mount.vfsPath, createNodeFsMountHandler(mount.hostPath));
-	}
-}
-
 /**
  * Print trace messages from PHP-WASM.
  *