From 406d3247b5a1982a3d9ec44667ae3e6f0218504c Mon Sep 17 00:00:00 2001 From: Tommy Nguyen <4123478+tido64@users.noreply.github.com> Date: Tue, 3 Feb 2026 13:58:27 +0100 Subject: [PATCH 1/2] fix(windows): ensure `react-native-windows` path can be found --- .github/actions/setup-toolchain/action.yml | 10 +++++----- packages/app/example/package.json | 2 +- packages/app/scripts/configure.mjs | 2 +- packages/app/windows/Win32/ReactApp.Package.wapproj | 2 +- yarn.lock | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/actions/setup-toolchain/action.yml b/.github/actions/setup-toolchain/action.yml index eb8d1be62..ba36eeb5d 100644 --- a/.github/actions/setup-toolchain/action.yml +++ b/.github/actions/setup-toolchain/action.yml @@ -9,7 +9,7 @@ inputs: description: Prefix to add to the cache key cache-npm-dependencies: description: Caches npm dependencies (supports npm, yarn, pnpm v6.10+) - default: yarn + default: "" java-version: description: Desired Java version default: "17" @@ -54,13 +54,13 @@ runs: shell: bash - name: Set up JDK if: ${{ inputs.platform == 'android' || inputs.platform == 'node' }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: temurin java-version: ${{ inputs.java-version }} - name: Set up Gradle if: ${{ inputs.platform == 'android' || inputs.platform == 'node' }} - uses: gradle/actions/setup-gradle@v4 + uses: gradle/actions/setup-gradle@v5 with: gradle-version: wrapper gradle-home-cache-excludes: | @@ -77,7 +77,7 @@ runs: bundler: Gemfile.lock bundler-cache: true - name: Set up Node.js - uses: actions/setup-node@v4.4.0 + uses: actions/setup-node@v6.2.0 with: node-version: ${{ inputs.node-version }} cache: ${{ inputs.cache-npm-dependencies }} @@ -98,7 +98,7 @@ runs: shell: bash - name: Cache /.ccache if: ${{ steps.setup-ccache.outputs.cache-key }} - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: .ccache key: ${{ runner.os }}-${{ inputs.cache-key-prefix }}-ccache-${{ steps.setup-ccache.outputs.cache-key }}-1 diff --git a/packages/app/example/package.json b/packages/app/example/package.json index 32b655119..39c28819d 100644 --- a/packages/app/example/package.json +++ b/packages/app/example/package.json @@ -36,7 +36,7 @@ "@react-native/babel-preset": "^0.79.0", "@react-native/metro-config": "^0.79.0", "@rnx-kit/cli": "^0.18.11", - "@rnx-kit/metro-config": "^2.1.0", + "@rnx-kit/metro-config": "^2.2.3", "@rnx-kit/polyfills": "^0.2.0", "@rnx-kit/tsconfig": "^2.0.0", "@types/react": "~19.0.0", diff --git a/packages/app/scripts/configure.mjs b/packages/app/scripts/configure.mjs index aad5cb943..80e7d5429 100755 --- a/packages/app/scripts/configure.mjs +++ b/packages/app/scripts/configure.mjs @@ -570,7 +570,7 @@ export function updatePackageManifest( const { name: rntaName, version: rntaVersion } = readManifest(); manifest["devDependencies"] = mergeObjects(manifest["devDependencies"], { - "@rnx-kit/metro-config": "^2.1.0", + "@rnx-kit/metro-config": "^2.2.3", [rntaName]: `^${rntaVersion}`, }); diff --git a/packages/app/windows/Win32/ReactApp.Package.wapproj b/packages/app/windows/Win32/ReactApp.Package.wapproj index 02a30f8a5..567290ca8 100644 --- a/packages/app/windows/Win32/ReactApp.Package.wapproj +++ b/packages/app/windows/Win32/ReactApp.Package.wapproj @@ -10,7 +10,7 @@ NativeOnly - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ + $([MSBuild]::GetDirectoryNameOfFileAbove($(SolutionDir), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ diff --git a/yarn.lock b/yarn.lock index e7a0f4357..71ebdb79c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3807,9 +3807,9 @@ __metadata: languageName: node linkType: hard -"@rnx-kit/metro-config@npm:^2.1.0": - version: 2.2.2 - resolution: "@rnx-kit/metro-config@npm:2.2.2" +"@rnx-kit/metro-config@npm:^2.2.3": + version: 2.2.3 + resolution: "@rnx-kit/metro-config@npm:2.2.3" dependencies: "@rnx-kit/tools-node": "npm:^3.0.0" "@rnx-kit/tools-react-native": "npm:^2.3.1" @@ -3821,7 +3821,7 @@ __metadata: peerDependenciesMeta: "@react-native/metro-config": optional: true - checksum: 10c0/0209a089ed9e4a8ed41454d508d48ccb6bed42dcb4679dcc1d99d007676195c1a758a1207842f605ead909a15e50de45933f894140e54e5ea76661651c9f17c3 + checksum: 10c0/82e2bfaa0af95764de4ed9aaede77179f99c33ca675aba68129bc7d619f201b3eadd3ffd39844a6f33cbbb619460e403f0488da4b40f11eaadd5538fd1c3707c languageName: node linkType: hard @@ -7845,7 +7845,7 @@ __metadata: "@react-native/babel-preset": "npm:^0.79.0" "@react-native/metro-config": "npm:^0.79.0" "@rnx-kit/cli": "npm:^0.18.11" - "@rnx-kit/metro-config": "npm:^2.1.0" + "@rnx-kit/metro-config": "npm:^2.2.3" "@rnx-kit/polyfills": "npm:^0.2.0" "@rnx-kit/tsconfig": "npm:^2.0.0" "@types/react": "npm:~19.0.0" From a53bc96938a0d1128cb31a256d7b6ce528c49975 Mon Sep 17 00:00:00 2001 From: Tommy Nguyen <4123478+tido64@users.noreply.github.com> Date: Tue, 3 Feb 2026 17:06:31 +0100 Subject: [PATCH 2/2] Revert `ReactApp.Package.wapproj` --- packages/app/windows/Win32/ReactApp.Package.wapproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/windows/Win32/ReactApp.Package.wapproj b/packages/app/windows/Win32/ReactApp.Package.wapproj index 567290ca8..02a30f8a5 100644 --- a/packages/app/windows/Win32/ReactApp.Package.wapproj +++ b/packages/app/windows/Win32/ReactApp.Package.wapproj @@ -10,7 +10,7 @@ NativeOnly - $([MSBuild]::GetDirectoryNameOfFileAbove($(SolutionDir), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\ + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\