chore(0.85): merge up to 0.85.3 from upstream branch

.changeset/sync-react-native-085.md

@@ -0,0 +1,6 @@
+---
+"react-native-macos": patch
+"@react-native-macos/virtualized-lists": patch
+---
+
+Sync to upstream React Native 0.85.x release.

.github/actions/test-ios-helloworld/action.yml

@@ -26,23 +26,30 @@ runs:
     - name: Set nightly Hermes versions
       shell: bash
       run: |
-        node ./scripts/releases/use-hermes-nightly.js
+        HERMES_VERSION=$(sed -n 's/^HERMES_VERSION_NAME=//p' packages/react-native/sdks/hermes-engine/version.properties)
+        if [ "$HERMES_VERSION" == "1000.0.0" ]; then
+          node ./scripts/releases/use-hermes-nightly.js
+        fi
     - name: Run yarn install again, with the correct hermes version
       uses: ./.github/actions/yarn-install
     - name: Download ReactNativeDependencies
+      if: ${{ inputs.use-frameworks != 'DynamicFrameworks' }}
       uses: actions/download-artifact@v7
       with:
         name: ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz
         path: /tmp/third-party
     - name: Print third-party folder
+      if: ${{ inputs.use-frameworks != 'DynamicFrameworks' }}
       shell: bash
       run: ls -lR /tmp/third-party
     - name: Download React Native Prebuilds
+      if: ${{ inputs.use-frameworks != 'DynamicFrameworks' }}
       uses: actions/download-artifact@v7
       with:
         name: ReactCore${{ inputs.flavor }}.xcframework.tar.gz
         path: /tmp/ReactCore
     - name: Print ReactCore folder
+      if: ${{ inputs.use-frameworks != 'DynamicFrameworks' }}
       shell: bash
       run: ls -lR /tmp/ReactCore
     - name: Install iOS dependencies - Configuration ${{ inputs.flavor }};
@@ -53,11 +60,11 @@ runs:
 
         if [[ ${{ inputs.use-frameworks }} == "DynamicFrameworks" ]]; then
           args+=(--frameworks dynamic)
+        else
+          export RCT_USE_LOCAL_RN_DEP="/tmp/third-party/ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz"
+          export RCT_TESTONLY_RNCORE_TARBALL_PATH="/tmp/ReactCore/ReactCore${{ inputs.flavor }}.xcframework.tar.gz"
         fi
 
-        export RCT_USE_LOCAL_RN_DEP="/tmp/third-party/ReactNativeDependencies${{ inputs.flavor }}.xcframework.tar.gz"
-        export RCT_TESTONLY_RNCORE_TARBALL_PATH="/tmp/ReactCore/ReactCore${{ inputs.flavor }}.xcframework.tar.gz"
-
         yarn bootstrap ios "${args[@]}" | cat
 
     - name: Run Helloworld tests

.github/actions/test-ios-rntester/action.yml

@@ -35,7 +35,10 @@ runs:
     - name: Set nightly Hermes versions
       shell: bash
       run: |
-        node ./scripts/releases/use-hermes-nightly.js
+        HERMES_VERSION=$(sed -n 's/^HERMES_VERSION_NAME=//p' packages/react-native/sdks/hermes-engine/version.properties)
+        if [ "$HERMES_VERSION" == "1000.0.0" ]; then
+          node ./scripts/releases/use-hermes-nightly.js
+        fi
     - name: Run yarn install again, with the correct hermes version
       uses: ./.github/actions/yarn-install
     - name: Prepare IOS Tests

.github/scripts/change.mts

@@ -40,7 +40,7 @@ async function getBaseBranch(): Promise<string> {
   const repoPath = repoUrl.match(/github\.com[:/](.+?)(?:\.git)?$/)?.[1] ?? '';
 
   const remotes = (await $`git remote -v`.quiet()).stdout;
-  const remote = (repoPath && remotes.match(new RegExp(`^(\\S+)\\s+.*${repoPath}`, 'm'))?.[1]) ?? 'origin';
+  const remote = repoPath ? (remotes.match(new RegExp(`^(\\S+)\\s+.*${repoPath}`, 'm'))?.[1] ?? 'origin') : 'origin'; // [macOS]
 
   // In CI, use the PR target branch (e.g., origin/0.81-stable)
   if (process.env['GITHUB_BASE_REF']) {

.github/workflows/analyze-pr.yml

@@ -11,7 +11,7 @@ permissions:
 jobs:
   analyze_pr:
     runs-on: ubuntu-latest
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     steps:
       - name: Check out main branch
         uses: actions/checkout@v6

.github/workflows/api-changes.yml

@@ -10,7 +10,7 @@ permissions:
 jobs:
   api_changes:
     runs-on: ubuntu-latest
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     steps:
       - name: Check out main branch
         uses: actions/checkout@v6

.github/workflows/cache-reaper.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   cache-cleaner:
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     runs-on: ubuntu-latest
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/check-for-reproducer.yml

@@ -8,7 +8,7 @@ jobs:
   check-for-reproducer:
     runs-on: ubuntu-latest
     if: |
-      github.repository == 'facebook/react-native' && github.event.issue.pull_request == null && github.event.issue.state == 'open' && !contains(github.event.issue.labels.*.name, ':open_umbrella: Umbrella')
+      github.repository == 'react/react-native' && github.event.issue.pull_request == null && github.event.issue.state == 'open' && !contains(github.event.issue.labels.*.name, ':open_umbrella: Umbrella')
     steps:
       - uses: actions/checkout@v6
       - uses: actions/github-script@v8

.github/workflows/close-pr.yml

@@ -9,7 +9,7 @@ permissions:
 jobs:
   comment-and-label:
     runs-on: ubuntu-latest
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     steps:
       - uses: actions/github-script@v8
         with:

.github/workflows/create-release.yml

@@ -19,7 +19,7 @@ on:
 
 jobs:
   create_release:
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

.github/workflows/monitor-new-issues.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   monitor-issues:
     runs-on: ubuntu-latest
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -34,7 +34,7 @@ jobs:
           git_secret: ${{ secrets.GITHUB_TOKEN }}
           notifier: "discord"
           fetch_data_interval: 6
-          repo_owner: "facebook"
+          repo_owner: "react"
           repo_name: "react-native"
           discord_webhook_url: "${{ secrets.DISCORD_WEBHOOK_URL }}"
           discord_id_type: "user"

.github/workflows/needs-attention.yml

@@ -14,7 +14,7 @@ jobs:
       issues: write # for react-native-community/needs-attention to label issues
     name: Apply Needs Attention Label
     runs-on: ubuntu-latest
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     steps:
       - uses: actions/checkout@v6
       - name: Apply Needs Attention Label

.github/workflows/nightly.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   set_release_type:
     runs-on: ubuntu-latest
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     outputs:
       RELEASE_TYPE: ${{ steps.set_release_type.outputs.RELEASE_TYPE }}
     env:
@@ -22,21 +22,20 @@ jobs:
           echo "RELEASE_TYPE=nightly" >> $GITHUB_OUTPUT
 
   prebuild_apple_dependencies:
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     uses: ./.github/workflows/prebuild-ios-dependencies.yml
     secrets: inherit
 
   prebuild_react_native_core:
     uses: ./.github/workflows/prebuild-ios-core.yml
     with:
-      use-hermes-nightly: true
       version-type: nightly
     secrets: inherit
     needs: [prebuild_apple_dependencies]
 
   build_android:
-    runs-on: 8-core-ubuntu
-    if: github.repository == 'facebook/react-native'
+    runs-on: ubuntu-latest
+    if: github.repository == 'react/react-native'
     needs: [set_release_type]
     container:
       image: reactnativecommunity/react-native-android:latest
@@ -61,7 +60,7 @@ jobs:
           gradle-cache-encryption-key: ${{ secrets.GRADLE_CACHE_ENCRYPTION_KEY }}
 
   build_npm_package:
-    runs-on: 8-core-ubuntu
+    runs-on: ubuntu-latest
     needs:
       [
         set_release_type,

.github/workflows/on-issue-labeled.yml

@@ -13,7 +13,7 @@ jobs:
   # then invokes actOnLabel to react to any added labels
   triage-issue:
     runs-on: ubuntu-latest
-    if: "${{ github.repository == 'facebook/react-native' && contains(github.event.label.name, 'Needs: Triage :mag:') }}"
+    if: "${{ github.repository == 'react/react-native' && contains(github.event.label.name, 'Needs: Triage :mag:') }}"
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
@@ -49,7 +49,7 @@ jobs:
   # Reacts to the label that triggered this workflow (added manually or via other workflows)
   act-on-label:
     runs-on: ubuntu-latest
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     steps:
       - uses: actions/checkout@v6
       - uses: actions/github-script@v8

.github/workflows/prebuild-ios-core.yml

@@ -8,11 +8,6 @@ on:
         type: string
         required: false
         default: ''
-      use-hermes-nightly:
-        description: 'Whether to use the hermes nightly build or read the version from the versions.properties file'
-        type: boolean
-        required: false
-        default: false
 
 jobs:
   build-rn-slice:
@@ -47,12 +42,9 @@ jobs:
       - name: Set Hermes version
         shell: bash
         run: |
-          if [ "${{ inputs.use-hermes-nightly }}" == "true" ]; then
-            # We are not publishing nightly versions of Hermes V1 yet.
-            # For now, we can use the latest version of Hermes V1 published on maven and npm.
+          HERMES_VERSION=$(sed -n 's/^HERMES_V1_VERSION_NAME=//p' packages/react-native/sdks/hermes-engine/version.properties)
+          if [ "$HERMES_VERSION" == "1000.0.0" ]; then
             HERMES_VERSION="latest-v1"
-          else
-            HERMES_VERSION=$(sed -n 's/^HERMES_V1_VERSION_NAME=//p' packages/react-native/sdks/hermes-engine/version.properties)
           fi
           echo "Using Hermes version: $HERMES_VERSION"
           echo "HERMES_VERSION=$HERMES_VERSION" >> $GITHUB_ENV

.github/workflows/publish-bumped-packages.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   publish_bumped_packages:
     runs-on: ubuntu-latest
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     env:
       GHA_NPM_TOKEN: ${{ secrets.GHA_NPM_TOKEN }}
     steps:

.github/workflows/publish-release.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   set_release_type:
     runs-on: ubuntu-latest
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     outputs:
       RELEASE_TYPE: ${{ steps.set_release_type.outputs.RELEASE_TYPE }}
     env:
@@ -21,7 +21,7 @@ jobs:
 
   set_hermes_versions:
     runs-on: ubuntu-latest
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     outputs:
       HERMES_VERSION: ${{ steps.set_hermes_versions.outputs.HERMES_VERSION }}
       HERMES_V1_VERSION: ${{ steps.set_hermes_versions.outputs.HERMES_V1_VERSION }}
@@ -42,7 +42,7 @@ jobs:
           echo "HERMES_V1_VERSION=${{ steps.set_hermes_versions.outputs.HERMES_V1_VERSION }}"
 
   prebuild_apple_dependencies:
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     uses: ./.github/workflows/prebuild-ios-dependencies.yml
     secrets: inherit
 
@@ -52,7 +52,7 @@ jobs:
     needs: [prebuild_apple_dependencies]
 
   build_npm_package:
-    runs-on: 8-core-ubuntu
+    runs-on: ubuntu-latest
     needs:
       [
         set_release_type,

.github/workflows/retry-workflow.yml

@@ -9,7 +9,7 @@ on:
 jobs:
     rerun:
         runs-on: ubuntu-latest
-        if: github.repository == 'facebook/react-native'
+        if: github.repository == 'react/react-native'
         steps:
             - name: rerun ${{ inputs.run_id }}
               env:

.github/workflows/stale-bot.yml

@@ -5,7 +5,7 @@ on:
 jobs:
   stale:
     runs-on: ubuntu-latest
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     permissions:
       issues: write
       pull-requests: write
@@ -22,7 +22,7 @@ jobs:
           exempt-pr-labels: 'Help Wanted :octocat:, Never gets stale'
   stale-asc:
     runs-on: ubuntu-latest
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     permissions:
       issues: write
       pull-requests: write
@@ -40,7 +40,7 @@ jobs:
           exempt-pr-labels: 'Help Wanted :octocat:, Never gets stale'
   stale-needs-author-feedback:
     runs-on: ubuntu-latest
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     permissions:
       issues: write
       pull-requests: write
@@ -58,7 +58,7 @@ jobs:
           exempt-pr-labels: "Help Wanted :octocat:, Never gets stale"
   stale-needs-author-feedback-asc:
     runs-on: ubuntu-latest
-    if: github.repository == 'facebook/react-native'
+    if: github.repository == 'react/react-native'
     permissions:
       issues: write
       pull-requests: write