feat: merge 0.85-merge into 0.84-merge

.eslintignore

@@ -17,3 +17,4 @@ private/react-native-codegen-typescript-test/lib/**/*
 **/Pods/*
 **/*.macos.js
 **/*.windows.js
+**/__fixtures__/**

.eslintrc.js

@@ -98,7 +98,7 @@ module.exports = {
         '**/__fixtures__/**/*.js',
         '**/__mocks__/**/*.js',
         '**/__tests__/**/*.js',
-        'packages/react-native/jest/**/*.js',
+        'packages/jest-preset/jest/**/*.js',
         'packages/rn-tester/**/*.js',
       ],
       globals: {

.flowconfig

@@ -8,9 +8,6 @@
 ; Ignore the codegen e2e tests
 <PROJECT_ROOT>/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeEnumTurboModule.js
 
-; Ignore the Dangerfile
-<PROJECT_ROOT>/private/react-native-bots/dangerfile.js
-
 ; Ignore "BUCK" generated dirs
 <PROJECT_ROOT>/\.buckd/
 
@@ -103,4 +100,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.295.0
+^0.303.0

.github/actions/build-android/action.yml

@@ -16,10 +16,19 @@ runs:
       uses: ./.github/actions/setup-node
     - name: Install node dependencies
       uses: ./.github/actions/yarn-install
+    - name: Read current RNVersion
+      shell: bash
+      id: read-rn-version
+      run: |
+        echo "rn-version=$(jq -r '.version' packages/react-native/package.json)" >> $GITHUB_OUTPUT
     - name: Set React Native Version
       # We don't want to set the version for stable branches, because this has been
       # already set from the 'create release' commits on the release branch.
-      if: ${{ !endsWith(github.ref_name, '-stable') }}
+      # For testing RC.0, though, the version has not been set yet. In that case, we are on Stable branch and
+      # it is the only case when the version is still 1000.0.0
+      # We also skip this when the PR targets a stable branch (github.base_ref ends with '-stable'),
+      # since the version is already set on the stable branch.
+      if: ${{ !endsWith(github.ref_name, '-stable') && !endsWith(github.base_ref || '', '-stable') || endsWith(github.ref_name, '-stable') && steps.read-rn-version.outputs.rn-version == '1000.0.0' }}
       shell: bash
       run: node ./scripts/releases/set-rn-artifacts-version.js --build-type ${{ inputs.release-type }}
     - name: Setup gradle

.github/actions/diff-js-api-changes/action.yml

@@ -1,24 +1,34 @@
 name: diff-js-api-changes
 description: Check for breaking changes in the public React Native JS API
+outputs:
+  message:
+    description: Formatted markdown message describing API changes, or empty if no changes
+    value: ${{ steps.format_output.outputs.message }}
 runs:
   using: composite
   steps:
-    - name: Compute merge base with main
+    - name: Fetch PR and main, compute merge base
       id: merge_base
       shell: bash
+      env:
+        PR_SHA: ${{ github.event.pull_request.head.sha }}
       run: |
         git fetch origin main
-        git fetch --deepen=500
-        echo "merge_base=$(git merge-base HEAD origin/main)" >> $GITHUB_OUTPUT
+        git fetch origin "$PR_SHA" --depth=500
+        echo "merge_base=$(git merge-base "$PR_SHA" origin/main)" >> $GITHUB_OUTPUT
 
-    - name: Output snapshot before state for comparison
+    - name: Extract before and after API snapshots
       shell: bash
       env:
         SCRATCH_DIR: ${{ runner.temp }}/diff-js-api-changes
+        MERGE_BASE: ${{ steps.merge_base.outputs.merge_base }}
+        PR_SHA: ${{ github.event.pull_request.head.sha }}
       run: |
         mkdir -p $SCRATCH_DIR
-        git show ${{ steps.merge_base.outputs.merge_base }}:packages/react-native/ReactNativeApi.d.ts > $SCRATCH_DIR/ReactNativeApi-before.d.ts \
+        git show "$MERGE_BASE":packages/react-native/ReactNativeApi.d.ts > $SCRATCH_DIR/ReactNativeApi-before.d.ts \
           || echo "" > $SCRATCH_DIR/ReactNativeApi-before.d.ts
+        git show "$PR_SHA":packages/react-native/ReactNativeApi.d.ts > $SCRATCH_DIR/ReactNativeApi-after.d.ts \
+          || echo "" > $SCRATCH_DIR/ReactNativeApi-after.d.ts
 
     - name: Run breaking change detection
       shell: bash
@@ -27,5 +37,37 @@ runs:
       run: |
         node ./scripts/js-api/diff-api-snapshot \
           $SCRATCH_DIR/ReactNativeApi-before.d.ts \
-          ./packages/react-native/ReactNativeApi.d.ts \
+          $SCRATCH_DIR/ReactNativeApi-after.d.ts \
           > $SCRATCH_DIR/output.json
+
+    - name: Format output message
+      id: format_output
+      shell: bash
+      env:
+        SCRATCH_DIR: ${{ runner.temp }}/diff-js-api-changes
+      run: |
+        if [ ! -f "$SCRATCH_DIR/output.json" ]; then
+          echo "message=" >> $GITHUB_OUTPUT
+          exit 0
+        fi
+
+        RESULT=$(cat $SCRATCH_DIR/output.json | jq -r '.result // empty')
+        if [ -z "$RESULT" ] || [ "$RESULT" = "NON_BREAKING" ]; then
+          echo "message=" >> $GITHUB_OUTPUT
+          exit 0
+        fi
+
+        # Use delimiter for multiline output
+        {
+          echo "message<<EOF"
+          echo "> [!WARNING]"
+          echo "> **JavaScript API change detected**"
+          echo ">"
+          echo "> This PR commits an update to \`ReactNativeApi.d.ts\`, indicating a change to React Native's public JavaScript API."
+          echo ">"
+          echo "> - Please include a **clear changelog message**."
+          echo "> - This change will be subject to additional review."
+          echo ">"
+          echo "> This change was flagged as: \`${RESULT}\`"
+          echo "EOF"
+        } >> $GITHUB_OUTPUT

.github/actions/maestro-ios/action.yml

@@ -30,7 +30,7 @@ runs:
       run: |
         brew tap facebook/fb
         brew install facebook/fb/idb-companion
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v5
       with:
         java-version: '17'

.github/actions/post-pr-comment/action.yml

@@ -0,0 +1,55 @@
+name: post-pr-comment
+description: Post or update a PR comment, or delete if no sections
+inputs:
+  sections:
+    description: 'JSON array of markdown sections to include in comment'
+    required: false
+    default: '[]'
+  header:
+    description: 'Optional header text to display at the top of the comment'
+    required: false
+    default: ''
+  marker:
+    description: 'HTML comment marker to identify this comment'
+    required: true
+runs:
+  using: composite
+  steps:
+    - name: Create, update, or delete comment
+      uses: actions/github-script@v8
+      env:
+        SECTIONS_INPUT: ${{ inputs.sections }}
+        MARKER_INPUT: ${{ inputs.marker }}
+        HEADER_INPUT: ${{ inputs.header }}
+      with:
+        script: |
+          const marker = process.env.MARKER_INPUT;
+          const header = process.env.HEADER_INPUT;
+          const sections = JSON.parse(process.env.SECTIONS_INPUT)
+            .filter(Boolean)
+            .filter(s => s.trim());
+
+          const {owner, repo} = context.repo;
+          const issue_number = context.issue.number;
+
+          const {data: comments} = await github.rest.issues.listComments({
+            owner, repo, issue_number,
+          });
+
+          const existing = comments.find(c => c.body?.includes(marker));
+
+          if (!sections.length) {
+            if (existing) {
+              await github.rest.issues.deleteComment({owner, repo, comment_id: existing.id});
+            }
+            return;
+          }
+
+          const content = sections.join('\n\n');
+          const body = header ? `${marker}\n## ${header}\n\n${content}` : `${marker}\n${content}`;
+
+          if (existing) {
+            await github.rest.issues.updateComment({owner, repo, comment_id: existing.id, body});
+          } else {
+            await github.rest.issues.createComment({owner, repo, issue_number, body});
+          }

.github/actions/setup-node/action.yml

@@ -4,7 +4,7 @@ inputs:
   node-version:
     description: 'The node.js version to use'
     required: false
-    default: '22.11.0'
+    default: '22.14.0'
 runs:
   using: "composite"
   steps:

.github/actions/setup-xcode/action.yml

@@ -4,33 +4,11 @@ inputs:
   xcode-version:
     description: 'The xcode version to use'
     required: false
-    default: '26.2'
-  platform:
-    description: 'The platform to use. Valid values are: ios, ios-simulator, macos, mac-catalyst, tvos, tvos-simulator, xros, xros-simulator'
-    required: false
-    default: 'macos'
+    default: '16.4.0'
 runs:
   using: "composite"
   steps:
     - name: Setup xcode
       uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd
       with:
         xcode-version: ${{ inputs.xcode-version }}
-    - name: Setup Platform ${{ inputs.platform }}
-      if: ${{ inputs.platform != 'macos' && inputs.platform != 'mac-catalyst' }}
-      shell: bash
-      run: |
-        # https://github.com/actions/runner-images/issues/12541
-        sudo xcodebuild -runFirstLaunch
-        sudo xcrun simctl list
-
-        # Install platform based on the platform
-        if [[ "${{ inputs.platform }}" == "xros" || "${{ inputs.platform }}" == "xros-simulator" ]]; then
-          sudo xcodebuild -downloadPlatform visionOS
-        elif [[ "${{ inputs.platform }}" == "tvos" || "${{ inputs.platform }}" == "tvos-simulator" ]]; then
-          sudo xcodebuild -downloadPlatform tvOS
-        else
-          sudo xcodebuild -downloadPlatform iOS
-        fi
-
-        sudo xcodebuild -runFirstLaunch

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

@@ -15,8 +15,6 @@ runs:
   steps:
     - name: Setup xcode
       uses: ./.github/actions/setup-xcode
-      with:
-        platform: ios
     - name: Setup node.js
       uses: ./.github/actions/setup-node
     - name: Run yarn install

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

@@ -6,7 +6,7 @@ inputs:
     default: 2.6.10
   run-unit-tests:
     description: whether unit tests should run or not.
-    default: "true"
+    default: false
   flavor:
     description: The flavor of the build. Must be one of "Debug", "Release".
     default: Debug
@@ -24,8 +24,6 @@ runs:
   steps:
     - name: Setup xcode
       uses: ./.github/actions/setup-xcode
-      with:
-        platform: ios
     - name: Setup node.js
       uses: ./.github/actions/setup-node
     - name: Run yarn

.github/scripts/__tests__/__fixtures__/resolve-hermes.cjs

@@ -54,6 +54,13 @@ const propertiesPath = path.resolve(
 );
 const readFileSync = fs.readFileSync;
 fs.readFileSync = function (file, ...args) {
+  if (
+    (file === path.resolve(helpersPath, '../../sdks/.hermesversion') ||
+      file === path.resolve(helpersPath, '../../sdks/.hermesv1version')) &&
+    process.env.HERMES_TEST_REF != null
+  ) {
+    return process.env.HERMES_TEST_REF;
+  }
   if (file === propertiesPath && process.env.HERMES_TEST_PROPERTIES != null) {
     if (process.env.HERMES_TEST_PROPERTIES === 'MISSING') {
       throw Object.assign(new Error(`ENOENT: ${propertiesPath}`), {