From f7c23e6167dba6bcad685a5e279d410d3f053116 Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <4123478+tido64@users.noreply.github.com>
Date: Thu, 8 Jan 2026 11:21:07 +0100
Subject: [PATCH] fix: declare support for 0.84

---
 packages/app/package.json                    |  2 +-
 packages/app/scripts/testing/test-apple.mts  |  2 +-
 packages/app/scripts/testing/test-e2e.mts    | 10 ++++++----
 packages/app/scripts/testing/test-matrix.mts | 13 +++++--------
 yarn.lock                                    |  2 +-
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/packages/app/package.json b/packages/app/package.json
index 3bca36d18..3750d1f77 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -99,7 +99,7 @@
     "@callstack/react-native-visionos": "0.76 - 0.79",
     "@expo/config-plugins": ">=5.0",
     "react": "18.2 - 19.2",
-    "react-native": "0.76 - 0.83 || >=0.83.0-0 <0.84.0",
+    "react-native": "0.76 - 0.84 || >=0.84.0-0 <0.85.0",
     "react-native-macos": "^0.0.0-0 || 0.76 - 0.81",
     "react-native-windows": "^0.0.0-0 || 0.76 - 0.81"
   },
diff --git a/packages/app/scripts/testing/test-apple.mts b/packages/app/scripts/testing/test-apple.mts
index 414e50341..62a54cfd5 100644
--- a/packages/app/scripts/testing/test-apple.mts
+++ b/packages/app/scripts/testing/test-apple.mts
@@ -32,7 +32,7 @@ export const getIOSSimulatorName = memo(() => {
       "An error occurred while trying to evaluate 'wdio.config.mjs'"
     );
   }
-  return stdout.trim();
+  return `'${stdout.trim()}'`;
 });
 
 /**
diff --git a/packages/app/scripts/testing/test-e2e.mts b/packages/app/scripts/testing/test-e2e.mts
index 0645a66e0..202d37be3 100644
--- a/packages/app/scripts/testing/test-e2e.mts
+++ b/packages/app/scripts/testing/test-e2e.mts
@@ -6,14 +6,16 @@ import { spawnSync } from "node:child_process";
 import { Socket } from "node:net";
 import { isMain } from "../helpers.js";
 
+export const DEFAULT_SPAWN_OPTIONS = {
+  stdio: "inherit",
+  shell: true, // Yarn won't be able to find commands otherwise
+} as const;
+
 /**
  * Invokes a shell command with optional arguments.
  */
 export function $(command: string, ...args: string[]) {
-  const { status } = spawnSync(command, args, {
-    stdio: "inherit",
-    shell: process.platform === "win32",
-  });
+  const { status } = spawnSync(command, args, DEFAULT_SPAWN_OPTIONS);
   if (status !== 0) {
     throw new Error(
       `An error occurred while executing: ${command} ${args.join(" ")}`
diff --git a/packages/app/scripts/testing/test-matrix.mts b/packages/app/scripts/testing/test-matrix.mts
index d05043fcc..231046a24 100644
--- a/packages/app/scripts/testing/test-matrix.mts
+++ b/packages/app/scripts/testing/test-matrix.mts
@@ -13,7 +13,7 @@ import type { BuildConfig, TargetPlatform } from "../types.js";
 import { green, red, yellow } from "../utils/colors.mjs";
 import { rm_r } from "../utils/filesystem.mjs";
 import { getIOSSimulatorName, installPods } from "./test-apple.mts";
-import { $, $$, test } from "./test-e2e.mts";
+import { $, $$, DEFAULT_SPAWN_OPTIONS, test } from "./test-e2e.mts";
 
 type PlatformConfig = {
   name: string;
@@ -364,8 +364,8 @@ if (platforms.length === 0) {
     .then(() => {
       showBanner("Initialize new app");
       $(
-        PACKAGE_MANAGER,
-        "init-test-app",
+        process.argv0,
+        "../scripts/init.mjs",
         "--destination",
         "template-example",
         "--name",
@@ -379,7 +379,7 @@ if (platforms.length === 0) {
     .then(() => {
       showBanner("Reconfigure existing app");
       const args = [
-        "configure-test-app",
+        "../scripts/configure.mjs",
         "-p",
         "android",
         "-p",
@@ -391,10 +391,7 @@ if (platforms.length === 0) {
         "-p",
         "windows",
       ];
-      const { status } = spawnSync(PACKAGE_MANAGER, args, {
-        stdio: "inherit",
-        shell: process.platform === "win32",
-      });
+      const { status } = spawnSync(process.argv0, args, DEFAULT_SPAWN_OPTIONS);
       if (status !== 1) {
         throw new Error("Expected an error");
       }
diff --git a/yarn.lock b/yarn.lock
index e4843285b..222788ba6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12262,7 +12262,7 @@ __metadata:
     "@callstack/react-native-visionos": 0.76 - 0.79
     "@expo/config-plugins": ">=5.0"
     react: 18.2 - 19.2
-    react-native: 0.76 - 0.83 || >=0.83.0-0 <0.84.0
+    react-native: 0.76 - 0.84 || >=0.84.0-0 <0.85.0
     react-native-macos: ^0.0.0-0 || 0.76 - 0.81
     react-native-windows: ^0.0.0-0 || 0.76 - 0.81
   peerDependenciesMeta: