add bundled node

Author: bcotrim

.gitignore

@@ -127,3 +127,7 @@ artifacts
 .cursor/
 .claude/
 CLAUDE.md
+
+# Bundled Node binary (downloaded during build)
+bin/node
+bin/node.exe

forge.config.ts

@@ -114,9 +114,10 @@ const config: ForgeConfig = {
 	],
 	plugins: [ new AutoUnpackNativesPlugin( {} ) ],
 	hooks: {
-		prePackage: async () => {
-			console.log( "Ensuring latest WordPress zip isn't included in production build ..." );
+		prePackage: async ( _forgeConfig, platform, arch ) => {
+			const execAsync = promisify( exec );
 
+			console.log( "Ensuring latest WordPress zip isn't included in production build ..." );
 			const zipPath = path.join( __dirname, 'wp-files', 'latest.zip' );
 			try {
 				fs.unlinkSync( zipPath );
@@ -125,8 +126,10 @@ const config: ForgeConfig = {
 			}
 
 			console.log( 'Building CLI ...' );
-			const execAsync = promisify( exec );
 			await execAsync( 'npm run cli:build' );
+
+			console.log( `Downloading Node.js binary for ${ platform }-${ arch }...` );
+			await execAsync( `./scripts/download-node-binary.sh ${ platform } ${ arch }` );
 		},
 	},
 };

scripts/download-node-binary.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+set -e
+
+# Download Node.js binary for bundling with Studio
+# Usage: ./scripts/download-node-binary.sh <platform> <arch>
+# Example: ./scripts/download-node-binary.sh darwin arm64
+
+NODE_VERSION="v22.12.0"  # LTS version
+PLATFORM="${1:-darwin}"
+ARCH="${2:-arm64}"
+
+# Map architecture names
+case "$ARCH" in
+  arm64) NODE_ARCH="arm64" ;;
+  x64)   NODE_ARCH="x64" ;;
+  *)     echo "Unsupported architecture: $ARCH"; exit 1 ;;
+esac
+
+# Map platform names
+case "$PLATFORM" in
+  darwin) NODE_PLATFORM="darwin" ;;
+  win32)  NODE_PLATFORM="win" ;;
+  linux)  NODE_PLATFORM="linux" ;;
+  *)      echo "Unsupported platform: $PLATFORM"; exit 1 ;;
+esac
+
+BIN_DIR="$(dirname "$0")/../bin"
+mkdir -p "$BIN_DIR"
+
+if [ "$NODE_PLATFORM" = "win" ]; then
+  FILENAME="node-${NODE_VERSION}-${NODE_PLATFORM}-${NODE_ARCH}.zip"
+  URL="https://nodejs.org/dist/${NODE_VERSION}/${FILENAME}"
+
+  echo "Downloading Node.js ${NODE_VERSION} for ${NODE_PLATFORM}-${NODE_ARCH}..."
+  curl -L "$URL" -o "/tmp/${FILENAME}"
+
+  echo "Extracting node.exe..."
+  unzip -j "/tmp/${FILENAME}" "node-${NODE_VERSION}-${NODE_PLATFORM}-${NODE_ARCH}/node.exe" -d "$BIN_DIR"
+  rm "/tmp/${FILENAME}"
+else
+  FILENAME="node-${NODE_VERSION}-${NODE_PLATFORM}-${NODE_ARCH}.tar.gz"
+  URL="https://nodejs.org/dist/${NODE_VERSION}/${FILENAME}"
+
+  echo "Downloading Node.js ${NODE_VERSION} for ${NODE_PLATFORM}-${NODE_ARCH}..."
+  curl -L "$URL" -o "/tmp/${FILENAME}"
+
+  echo "Extracting node binary..."
+  tar -xzf "/tmp/${FILENAME}" -C /tmp
+  cp "/tmp/node-${NODE_VERSION}-${NODE_PLATFORM}-${NODE_ARCH}/bin/node" "$BIN_DIR/node"
+  chmod +x "$BIN_DIR/node"
+  rm -rf "/tmp/${FILENAME}" "/tmp/node-${NODE_VERSION}-${NODE_PLATFORM}-${NODE_ARCH}"
+fi
+
+echo "Node.js binary installed to $BIN_DIR"
+ls -la "$BIN_DIR"

src/modules/cli/lib/execute-command.ts

@@ -1,7 +1,7 @@
 import { fork, ChildProcess, StdioOptions } from 'node:child_process';
 import EventEmitter from 'node:events';
 import * as Sentry from '@sentry/electron/main';
-import { getCliPath } from 'src/storage/paths';
+import { getBundledNodeBinaryPath, getCliPath } from 'src/storage/paths';
 
 export interface CliCommandResult {
 	stdout: string;
@@ -55,13 +55,10 @@ export function executeCliCommand(
 		stdio = [ 'ignore', 'ignore', 'ignore', 'ipc' ];
 	}
 
-	// Using Electron's utilityProcess.fork API gave us issues with the child process never exiting
 	const child = fork( cliPath, [ ...args, '--avoid-telemetry' ], {
 		stdio,
-		env: {
-			...process.env,
-			ELECTRON_RUN_AS_NODE: '1',
-		},
+		execPath: getBundledNodeBinaryPath(),
+		env: process.env,
 	} );
 	const eventEmitter = new CliCommandEventEmitter();
 

src/storage/paths.ts

@@ -66,6 +66,18 @@ export function getCliPath(): string {
 		: path.join( getResourcesPath(), 'cli', 'main.js' );
 }
 
+export function getBundledNodeBinaryPath(): string {
+	const nodeBinaryName = process.platform === 'win32' ? 'node.exe' : 'node';
+
+	if ( process.env.NODE_ENV === 'development' || process.env.NODE_ENV === 'test' ) {
+		// In development, use system Node
+		const { execSync } = require( 'child_process' );
+		return execSync( 'which node', { encoding: 'utf-8' } ).trim();
+	}
+
+	return path.join( getResourcesPath(), 'bin', nodeBinaryName );
+}
+
 function getAppDataPath(): string {
 	if ( inChildProcess() ) {
 		if ( ! process.env.STUDIO_APP_DATA_PATH ) {