From 84185b36f91d6ee49456308924e2693bac97ab2a Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <4123478+tido64@users.noreply.github.com>
Date: Thu, 18 Jun 2026 10:57:28 +0200
Subject: [PATCH] chore(windows): minor build fixes for 0.84

---
 .github/workflows/build.yml           | 4 +---
 .yarnrc.yml                           | 1 +
 package.json                          | 2 +-
 packages/app/example/package.json     | 1 +
 packages/app/example/tsconfig.json    | 2 +-
 packages/example-windows/package.json | 1 +
 yarn.lock                             | 3 ++-
 7 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 19a9d8c44..b2877a674 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -545,7 +545,6 @@ jobs:
         uses: ./.github/actions/setup-toolchain
         with:
           platform: windows
-          node-version: 22
       - name: Set up react-native@canary
         if: ${{ github.event_name == 'schedule' }}
         uses: ./.github/actions/setup-react-native
@@ -561,7 +560,7 @@ jobs:
         working-directory: packages/example-windows
       - name: Generate Visual Studio solution
         run: |
-          node ../app/windows/app.mjs --msbuildprops WindowsTargetPlatformVersion=$env:WindowsTargetPlatformVersion
+          node --run prebuild -- --msbuildprops WindowsTargetPlatformVersion=$env:WindowsTargetPlatformVersion
         working-directory: packages/example-windows
       - name: Test `react-native config`
         run: |
@@ -614,7 +613,6 @@ jobs:
         uses: ./.github/actions/setup-toolchain
         with:
           platform: windows
-          node-version: 22
       - name: Initialize test app
         uses: ./.github/actions/init-test-app
         with:
diff --git a/.yarnrc.yml b/.yarnrc.yml
index 6e265820b..d74327e87 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -2,6 +2,7 @@ catalog:
   "@babel/core": ^7.25.2
   "@babel/preset-env": ^7.25.3
   "@react-native-webapis/web-storage": ^0.4.5
+  "@types/node": ^24.0.0
   "@rnx-kit/cli": ^2.0.1
   "@rnx-kit/metro-config": ^2.2.4
   "@rnx-kit/polyfills": ^0.3.0
diff --git a/package.json b/package.json
index d145195ed..32318b2c4 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@swc-node/register": "^1.11.1",
     "@swc/core": "^1.15.8",
     "@types/js-yaml": "^4.0.5",
-    "@types/node": "^24.0.0",
+    "@types/node": "catalog:",
     "eslint-plugin-wdio": "^9.26.0",
     "globals": "^16.5.0",
     "js-yaml": "^4.1.0",
diff --git a/packages/app/example/package.json b/packages/app/example/package.json
index c57d739c0..17344405d 100644
--- a/packages/app/example/package.json
+++ b/packages/app/example/package.json
@@ -37,6 +37,7 @@
     "@rnx-kit/polyfills": "catalog:",
     "@rnx-kit/react-native-template-web": "workspace:*",
     "@rnx-kit/tsconfig": "catalog:",
+    "@types/node": "catalog:",
     "@types/react": "~19.2.0",
     "@wdio/types": "^9.20.0",
     "appium": "^3.1.1",
diff --git a/packages/app/example/tsconfig.json b/packages/app/example/tsconfig.json
index b83486453..a845da890 100644
--- a/packages/app/example/tsconfig.json
+++ b/packages/app/example/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "@rnx-kit/tsconfig/tsconfig.json",
+  "extends": "@rnx-kit/tsconfig/tsconfig.nodenext.json",
   "compilerOptions": {
     "jsx": "react-native",
     "noEmit": true,
diff --git a/packages/example-windows/package.json b/packages/example-windows/package.json
index 5fea95095..01dda5556 100644
--- a/packages/example-windows/package.json
+++ b/packages/example-windows/package.json
@@ -10,6 +10,7 @@
     "ci:windows": "rnx-cli run-windows --logging --no-packager --no-launch --no-deploy --msbuildprops UseBundle=false --no-telemetry",
     "clean": "yarn workspace react-native-test-app clean",
     "ios": "rnx-cli run --platform ios",
+    "prebuild": "node ../app/windows/app.mjs",
     "set-react-version": "yarn workspace react-native-test-app set-react-version",
     "start": "rnx-cli start",
     "windows": "rnx-cli run-windows --no-packager"
diff --git a/yarn.lock b/yarn.lock
index 13b2d18d0..ea405b69f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2495,7 +2495,7 @@ __metadata:
     "@swc-node/register": "npm:^1.11.1"
     "@swc/core": "npm:^1.15.8"
     "@types/js-yaml": "npm:^4.0.5"
-    "@types/node": "npm:^24.0.0"
+    "@types/node": "catalog:"
     eslint-plugin-wdio: "npm:^9.26.0"
     globals: "npm:^16.5.0"
     js-yaml: "npm:^4.1.0"
@@ -8390,6 +8390,7 @@ __metadata:
     "@rnx-kit/polyfills": "catalog:"
     "@rnx-kit/react-native-template-web": "workspace:*"
     "@rnx-kit/tsconfig": "catalog:"
+    "@types/node": "catalog:"
     "@types/react": "npm:~19.2.0"
     "@wdio/types": "npm:^9.20.0"
     appium: "npm:^3.1.1"