expo-desktop 1.0.3 → 1.0.5

package/build/common/expo/freeport.js

@@ -23,10 +23,10 @@ export async function testPortAsync(port, hostnames) {
             return false;
         }
     }
-    // On Windows, a wildcard IPv6 bind can succeed while an existing IPv4
-    // listener still owns the same port. Consult the OS listener table after
-    // the bind probe so loopback and wildcard listeners are both detected.
-    if (process.platform === "win32" && (await getPID(port)) !== null) {
+    // A wildcard bind can succeed while an existing listener on another address
+    // still owns the same port. Confirm against the OS listener table on every
+    // platform so loopback and wildcard listeners are both detected.
+    if ((await getPID(port)) !== null) {
         return false;
     }
     return true;

package/build/common/expo/get-running-process.js

@@ -12,7 +12,7 @@ export async function getPID(port) {
         return getWindowsPIDAsync(port);
     }
     try {
-        const { stdout } = await spawnAsync("lsof", [`-i:${port}`, "-P", "-t", "-sTCP:LISTEN"], {
+        const { stdout } = await spawnAsync("lsof", [`-iTCP:${port}`, "-nP", "-t", "-sTCP:LISTEN"], {
             timeout,
         });
         const pid = Number(stdout.split("\n", 1)[0].trim());
@@ -30,7 +30,9 @@ export async function getPID(port) {
 /** Return the PID listening on a TCP port on Windows. */
 async function getWindowsPIDAsync(port) {
     try {
-        const { stdout } = await spawnAsync("netstat.exe", ["-ano", "-p", "tcp"], {
+        // `-p tcp` excludes IPv6 listeners on Windows, including Metro on ::1.
+        // Inspect both address families and filter the TCP rows below.
+        const { stdout } = await spawnAsync("netstat.exe", ["-ano"], {
             timeout,
         });
         for (const line of stdout.split(/\r?\n/)) {

package/build/common/expo/resolve-package-manager.js

@@ -101,6 +101,10 @@ export async function installDependenciesAsync(projectRoot, packageManager, flag
 export async function configurePackageManager(projectRoot, packageManager, flags = { silent: false }) {
     const manager = createPackageManager(packageManager, { cwd: projectRoot, ...flags });
     switch (manager.name) {
+        case "pnpm": {
+            await manager.runAsync(['config', '--location', 'project', 'set', 'node-linker', 'hoisted']);
+            break;
+        }
         case "yarn": {
             let yarnVersion;
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-desktop",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Best-effort desktop support for Expo",
   "keywords": [
     "android",
@@ -94,7 +94,7 @@
     "generate-config": "node scripts/generate-config.ts",
     "schema": "node scripts/update-schema.ts",
     "start": "node src/cli.ts",
-    "demo": "npm_config_user_agent=bun node --run start -- create-app --template ../../templates/blank-typescript/expo-desktop-template-blank-typescript-54.81.0.tgz",
+    "demo": "npm_config_user_agent=bun node --run start -- create-app --template ../../templates/blank-typescript/expo-desktop-template-blank-typescript-55.83.1.tgz",
     "test": "vitest run"
   }
 }

package/scripts/terminateApp.jxa.js

@@ -78,7 +78,13 @@ function run(argv) {
 
   updateTerminatedProcessIds(workspace);
   if (terminatedProcessIds.size < processIds.size) {
-    $.CFRunLoopRunInMode($.kCFRunLoopDefaultMode, terminationTimeoutSeconds, false);
+    if (terminationTimeoutSeconds === 0) {
+      // Zero means no timeout here; CFRunLoopRunInMode(..., 0, ...) only runs once.
+      // The observer stops this loop when every matching app has exited.
+      $.CFRunLoopRun();
+    } else {
+      $.CFRunLoopRunInMode($.kCFRunLoopDefaultMode, terminationTimeoutSeconds, false);
+    }
   }
 
   workspace.removeObserverForKeyPath(observer, "runningApplications");