Merge branch 'main' into set-log-box-max-font-size

Author: pchalupa

.flowconfig

@@ -95,4 +95,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.313.0
+^0.314.0

.github/actions/build-npm-package/action.yml

@@ -10,6 +10,10 @@ inputs:
     default: ''
   gradle-cache-encryption-key:
     description: The encryption key needed to store the Gradle Configuration cache
+  skip-apple-prebuilts:
+    description: When true, skip downloading prebuilt Apple artifacts (use when Apple prebuild jobs were skipped)
+    required: false
+    default: 'false'
 
 runs:
   using: composite
@@ -18,18 +22,21 @@ runs:
       shell: bash
       run: git config --global --add safe.directory '*'
     - name: Download ReactNativeDependencies
+      if: ${{ inputs.skip-apple-prebuilts != 'true' }}
       uses: actions/download-artifact@v7
       with:
         pattern: ReactNativeDependencies*
         path: ./packages/react-native/ReactAndroid/external-artifacts/artifacts
         merge-multiple: true
     - name: Download ReactCore artifacts
+      if: ${{ inputs.skip-apple-prebuilts != 'true' }}
       uses: actions/download-artifact@v7
       with:
         pattern: ReactCore*
         path: ./packages/react-native/ReactAndroid/external-artifacts/artifacts
         merge-multiple: true
     - name: Print Artifacts Directory
+      if: ${{ inputs.skip-apple-prebuilts != 'true' }}
       shell: bash
       run: ls -lR ./packages/react-native/ReactAndroid/external-artifacts/artifacts/
     - name: Setup gradle

.github/workflows/nightly.yml

@@ -6,6 +6,9 @@ on:
   schedule:
     - cron: "15 2 * * *"
 
+permissions:
+  contents: read
+
 jobs:
   set_release_type:
     runs-on: ubuntu-latest

.github/workflows/test-all.yml

@@ -99,6 +99,7 @@ jobs:
 
   prebuild_react_native_core:
     uses: ./.github/workflows/prebuild-ios-core.yml
+    if: ${{ needs.prebuild_apple_dependencies.result == 'success' }}
     with:
       use-hermes-prebuilt: ${{ !endsWith(github.ref_name, '-stable') }}
     secrets: inherit
@@ -108,6 +109,7 @@ jobs:
     runs-on: macos-15
     needs:
       [prebuild_apple_dependencies, prebuild_react_native_core]
+    if: ${{ needs.prebuild_react_native_core.result == 'success' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -141,6 +143,7 @@ jobs:
     runs-on: macos-15-large
     needs:
       [prebuild_apple_dependencies, prebuild_react_native_core]
+    if: ${{ needs.prebuild_react_native_core.result == 'success' }}
     continue-on-error: true
     strategy:
       fail-fast: false
@@ -158,6 +161,7 @@ jobs:
 
   test_e2e_ios_rntester:
     needs: test_ios_rntester
+    if: ${{ needs.test_ios_rntester.result == 'success' }}
     uses: ./.github/workflows/e2e-ios-rntester.yml
     secrets: inherit
 
@@ -176,7 +180,8 @@ jobs:
     secrets: inherit
 
   test_e2e_ios_templateapp:
-    needs: [build_npm_package, prebuild_apple_dependencies]
+    needs: [build_npm_package, prebuild_apple_dependencies, check_code_changes]
+    if: needs.check_code_changes.outputs.should_test_ios == 'true'
     uses: ./.github/workflows/e2e-ios-templateapp.yml
     secrets: inherit
 
@@ -195,7 +200,8 @@ jobs:
     secrets: inherit
 
   test_e2e_android_templateapp:
-    needs: build_npm_package
+    needs: [build_npm_package, build_android]
+    if: ${{ always() && needs.build_android.result == 'success' && needs.build_npm_package.result == 'success' }}
     uses: ./.github/workflows/e2e-android-templateapp.yml
     secrets: inherit
 
@@ -284,6 +290,7 @@ jobs:
 
   test_e2e_android_rntester:
     needs: build_android
+    if: ${{ needs.build_android.result == 'success' }}
     uses: ./.github/workflows/e2e-android-rntester.yml
     secrets: inherit
 
@@ -306,10 +313,15 @@ jobs:
     needs:
       [
         set_release_type,
+        check_code_changes,
         build_android,
         prebuild_apple_dependencies,
         prebuild_react_native_core,
       ]
+    if: |
+      always() &&
+      !contains(needs.*.result, 'failure') &&
+      !contains(needs.*.result, 'cancelled')
     container:
       image: reactnativecommunity/react-native-android:latest
       env:
@@ -327,10 +339,12 @@ jobs:
         with:
           release-type: ${{ needs.set_release_type.outputs.RELEASE_TYPE }}
           gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }}
+          skip-apple-prebuilts: ${{ needs.check_code_changes.outputs.should_test_ios == 'false' }}
 
   test_android_helloworld:
     runs-on: 4-core-ubuntu
-    needs: build_npm_package
+    needs: [build_npm_package, build_android]
+    if: ${{ always() && needs.build_android.result == 'success' && needs.build_npm_package.result == 'success' }}
     container:
       image: reactnativecommunity/react-native-android:latest
     env:
@@ -396,6 +410,7 @@ jobs:
   test_ios_helloworld_with_ruby_3_2_0:
     runs-on: macos-15
     needs: [prebuild_apple_dependencies, prebuild_react_native_core]
+    if: ${{ needs.prebuild_react_native_core.result == 'success' }}
     env:
       PROJECT_NAME: iOSTemplateProject
       YARN_ENABLE_IMMUTABLE_INSTALLS: false
@@ -410,6 +425,7 @@ jobs:
   test_ios_helloworld:
     runs-on: macos-15
     needs: [prebuild_apple_dependencies, prebuild_react_native_core]
+    if: ${{ needs.prebuild_react_native_core.result == 'success' }}
     strategy:
       matrix:
         flavor: [Debug, Release]
@@ -435,6 +451,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v6
+      - name: Setup Node.js
+        uses: ./.github/actions/setup-node
       - name: Install dependencies
         uses: ./.github/actions/yarn-install
       - name: Lint file structure
@@ -466,7 +484,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: ["24", "22", "20.19.4"]
+        node-version: ["24", "22.13.0"]
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -510,4 +528,3 @@ jobs:
       - name: Verify debugger-shell build
         shell: bash
         run: node scripts/debugger-shell/build-binary.js
-

.github/workflows/validate-cxx-api-snapshots.yml

@@ -25,6 +25,9 @@ on:
 env:
   DOXYGEN_VERSION: "1.16.1"
 
+permissions:
+  contents: read
+
 jobs:
   validate_cxx_api_snapshots:
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## v0.86.0-rc.1
+
+### Fixed
+
+#### Android specific
+
+- **Image**: `Image.getSize` and `Image.getSizeWithHeaders` now return the true source dimensions instead of Fresco's downsampled values ([8823a8009b](https://github.com/facebook/react-native/commit/8823a8009b18950d5be2682a86cfcf0c7014a068) by [@zoontek](https://github.com/zoontek))
+
+#### iOS specific
+
+- **Build**: Persist `PODFILE_DIR` as `$(SRCROOT)`-relative so `project.pbxproj` is portable across machines ([44bb83bd84](https://github.com/facebook/react-native/commit/44bb83bd843a3b34779f1e7b1e09dbb3f4f38c6a) by [@zoontek](https://github.com/zoontek))
+
 ## v0.86.0-rc.0
 
 ### Added

package.json

@@ -62,11 +62,11 @@
     "@react-native/metro-config": "0.87.0-main",
     "@tsconfig/node22": "22.0.2",
     "@types/react": "^19.1.0",
-    "@typescript-eslint/parser": "^8.36.0",
+    "@typescript-eslint/parser": "^8.59.2",
     "ansi-regex": "^5.0.0",
     "ansi-styles": "^4.2.1",
     "babel-plugin-minify-dead-code-elimination": "^0.5.2",
-    "babel-plugin-syntax-hermes-parser": "0.36.0",
+    "babel-plugin-syntax-hermes-parser": "0.36.1",
     "babel-plugin-transform-define": "^2.1.4",
     "babel-plugin-transform-flow-enums": "^0.0.2",
     "clang-format": "^1.8.0",
@@ -85,10 +85,10 @@
     "eslint-plugin-redundant-undefined": "^0.4.0",
     "eslint-plugin-relay": "^1.8.3",
     "fb-dotslash": "0.5.8",
-    "flow-api-translator": "0.36.0",
-    "flow-bin": "^0.313.0",
-    "hermes-eslint": "0.36.0",
-    "hermes-transform": "0.36.0",
+    "flow-api-translator": "0.36.1",
+    "flow-bin": "^0.314.0",
+    "hermes-eslint": "0.36.1",
+    "hermes-transform": "0.36.1",
     "ini": "^5.0.0",
     "inquirer": "^7.1.0",
     "jest": "^29.7.0",
@@ -116,7 +116,7 @@
     "temp-dir": "^2.0.0",
     "tinybench": "^4.1.0",
     "tinyglobby": "^0.2.15",
-    "typescript": "5.8.3",
+    "typescript": "^6.0.3",
     "ws": "^7.5.10"
   },
   "resolutions": {

packages/assets/package.json

@@ -17,7 +17,7 @@
   ],
   "bugs": "https://github.com/facebook/react-native/issues",
   "engines": {
-    "node": "^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0"
+    "node": "^22.13.0 || ^24.3.0 || >= 26.0.0"
   },
   "files": [
     "path-support.js",

packages/babel-plugin-codegen/package.json

@@ -19,7 +19,7 @@
   ],
   "bugs": "https://github.com/facebook/react-native/issues",
   "engines": {
-    "node": "^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0"
+    "node": "^22.13.0 || ^24.3.0 || >= 26.0.0"
   },
   "files": [
     "index.js"

packages/community-cli-plugin/package.json

@@ -55,6 +55,6 @@
     }
   },
   "engines": {
-    "node": "^20.19.4 || ^22.13.0 || ^24.3.0 || >= 25.0.0"
+    "node": "^22.13.0 || ^24.3.0 || >= 26.0.0"
   }
 }