chore(0.83): merge up to 0.83.10 from upstream branch

.changeset/config.json

@@ -4,6 +4,6 @@
   "baseBranch": "origin/main",
   "changelog": "@changesets/cli/changelog",
   "commit": false,
-  "ignore": [],
+  "ignore": ["@react-native/tester"],
   "linked": []
 }

.changeset/sync-react-native-0-83-10.md

@@ -0,0 +1,5 @@
+---
+"react-native-macos": minor
+---
+
+Sync react-native-macos with React Native 0.83.10. This is the first `0.83` release of react-native-macos.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -16,11 +16,11 @@ body:
         * If you're found a problem with our **documentation**, [report it here](https://github.com/facebook/react-native-website/issues/).
         * If you're having an issue with **Metro** (the bundler), [report it here](https://github.com/facebook/metro/issues/).
         * If you're using an external library, report the issue to the **library first**.
-        * Please [search for similar issues](https://github.com/facebook/react-native/issues) in our issue tracker.
+        * Please [search for similar issues](https://github.com/react/react-native/issues) in our issue tracker.
 
         Make sure that your issue:
         * Have a **valid reproducer** (See [How to report a bug](https://reactnative.dev/contributing/how-to-report-a-bug)).
-        * Is tested against the [**latest stable**](https://github.com/facebook/react-native/releases/) of React Native.
+        * Is tested against the [**latest stable**](https://github.com/react/react-native/releases/) of React Native.
 
         🚨 IMPORTANT: Due to the extreme number of bugs we receive, issues **without a reproducer** or for an [**unsupported versions**](https://github.com/reactwg/react-native-releases#which-versions-are-currently-supported) of React Native **will be closed**.
   - type: textarea

.github/ISSUE_TEMPLATE/debugger_bug_report.yml

@@ -16,9 +16,9 @@ body:
         * If you've found a problem with our **documentation**, [report it here](https://github.com/facebook/react-native-website/issues/).
         * If you're having an issue with **Metro** (the bundler), [report it here](https://github.com/facebook/metro/issues/).
         * If you're using an external library, report the issue to the **library first**.
-        * Please [search for similar issues](https://github.com/facebook/react-native/issues) in our issue tracker.
+        * Please [search for similar issues](https://github.com/react/react-native/issues) in our issue tracker.
 
-        Make sure that your issue is tested against the [**latest stable**](https://github.com/facebook/react-native/releases/) of React Native.
+        Make sure that your issue is tested against the [**latest stable**](https://github.com/react/react-native/releases/) of React Native.
   - type: textarea
     id: description
     attributes:

.github/ISSUE_TEMPLATE/new_architecture_bug_report.yml

@@ -12,12 +12,12 @@ body:
         Thank you for taking the time to report an issue for [the New Architecture of React Native](https://reactnative.dev/docs/the-new-architecture/landing-page),
         your contribution will help make the framework better for everyone.
 
-        If you're **NOT** using the New Architecture, please use this [other bug type](https://github.com/facebook/react-native/issues/new?template=bug_report.yml).
+        If you're **NOT** using the New Architecture, please use this [other bug type](https://github.com/react/react-native/issues/new?template=bug_report.yml).
         Do not attempt to open a bug in this category if you're not using the New Architecture as your bug will be closed.
 
         Make sure that your issue:
         * Have a **valid reproducer** (See [How to report a bug](https://reactnative.dev/contributing/how-to-report-a-bug)).
-        * Is tested against the [**latest stable**](https://github.com/facebook/react-native/releases/) of React Native.
+        * Is tested against the [**latest stable**](https://github.com/react/react-native/releases/) of React Native.
 
         🚨 IMPORTANT: Due to the extreme number of bugs we receive, issues **without a reproducer** or for an [**unsupported versions**](https://github.com/reactwg/react-native-releases#which-versions-are-currently-supported) of React Native **will be closed**.
   - type: textarea

.github/RELEASE_TEMPLATE.md

@@ -20,4 +20,4 @@ To help you upgrade to this version, you can use the [upgrade helper](https://re
 
 ---
 
-See changes from this release in the [changelog PR](https://github.com/facebook/react-native/labels/%F0%9F%93%9D%20Changelog)
+See changes from this release in the [changelog PR](https://github.com/react/react-native/labels/%F0%9F%93%9D%20Changelog)

.github/SUPPORT.md

@@ -15,7 +15,7 @@ The React Native website is hosted on a [separate repository](https://github.com
 
 ## 🐛 I found a bug in React Native.
 
-If you want to report a reproducible bug or regression in the React Native library, you can [create a new issue](https://github.com/facebook/react-native/issues/new?labels=Type%3A+Bug+Report&template=bug_report.md). It's a good idea to look through [open issues](https://github.com/facebook/react-native/issues) before doing so, as someone else may have reported a similar issue.
+If you want to report a reproducible bug or regression in the React Native library, you can [create a new issue](https://github.com/react/react-native/issues/new?labels=Type%3A+Bug+Report&template=bug_report.md). It's a good idea to look through [open issues](https://github.com/react/react-native/issues) before doing so, as someone else may have reported a similar issue.
 
 
 ## 🚀 I want to discuss the future of React Native.

.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=$(cat packages/react-native/package.json | jq -r '.version')" >> $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/test-ios-helloworld/action.yml

@@ -10,6 +10,10 @@ inputs:
   flavor:
     description: The flavor of the build. Must be one of "Debug", "Release".
     default: Debug
+  use-hermes-nightly:
+    description: Whether to override pinned Hermes versions with the latest nightly
+    required: false
+    default: 'true'
 runs:
   using: composite
   steps:
@@ -26,25 +30,34 @@ runs:
       with:
         ruby-version: ${{ inputs.ruby-version }}
     - name: Set nightly Hermes versions
+      if: ${{ inputs.use-hermes-nightly == 'true' }}
       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
+      if: ${{ inputs.use-hermes-nightly == 'true' }}
       uses: ./.github/actions/yarn-install
     - name: Download ReactNativeDependencies
+      if: ${{ inputs.use-frameworks != 'DynamicFrameworks' }}
       uses: actions/download-artifact@v4
       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@v4
       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 }};
@@ -55,11 +68,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

@@ -17,6 +17,10 @@ inputs:
     description: Whether we want to run E2E tests or not
     required: false
     default: false
+  use-hermes-nightly:
+    description: Whether to override pinned Hermes versions with the latest nightly
+    required: false
+    default: 'true'
 
 runs:
   using: composite
@@ -34,38 +38,47 @@ runs:
       with:
         ruby-version: ${{ inputs.ruby-version }}
     - name: Set nightly Hermes versions
+      if: ${{ inputs.use-hermes-nightly == 'true' }}
       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
+      if: ${{ inputs.use-hermes-nightly == 'true' }}
       uses: ./.github/actions/yarn-install
     - name: Prepare IOS Tests
       if: ${{ inputs.run-unit-tests == 'true' }}
       uses: ./.github/actions/prepare-ios-tests
     - name: Download ReactNativeDependencies
+      if: ${{ inputs.use-frameworks != 'DynamicFrameworks' }}
       uses: actions/download-artifact@v4
       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@v4
       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 CocoaPods dependencies
       shell: bash
       run: |
-        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"
-
         if [[ ${{ inputs.use-frameworks }} == "DynamicFrameworks" ]]; then
           export USE_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
 
         cd packages/rn-tester

.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';
 
   // In CI, use the PR target branch (e.g., origin/0.81-stable)
   if (process.env['GITHUB_BASE_REF']) {

.github/scripts/export-versions.mts

@@ -24,7 +24,7 @@ function exportValue(name: string, value: string): void {
   }
 }
 
-const { dependencies, peerDependencies } = manifest;
+const { peerDependencies } = manifest;
 
 exportValue("react_version", peerDependencies["react"]);
-exportValue("react_native_version", coerce(dependencies["@react-native/codegen"]));
+exportValue("react_native_version", coerce(peerDependencies["react-native"]));