Fix CQS signal modernize-use-designated-initializers in xplat/js/react-native-github/packages (#53963)

Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/53963

Reviewed By: javache

Differential Revision: D83322011

.flowconfig

@@ -75,11 +75,6 @@ module.system.haste.module_ref_prefix=m#
 
 react.runtime=automatic
 
-experimental.only_support_flow_fixme_and_expected_error=true
-experimental.require_suppression_with_error_code=true
-experimental.invariant_subtyping_error_message_improvement=true
-experimental.natural_inference.local_object_literals.followup_fix=true
-
 ban_spread_key_props=true
 
 [lints]
@@ -103,4 +98,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.280.0
+^0.286.0

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

@@ -17,6 +17,9 @@ runs:
     - name: Install node dependencies
       uses: ./.github/actions/yarn-install
     - 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') }}
       shell: bash
       run: node ./scripts/releases/set-rn-artifacts-version.js --build-type ${{ inputs.release-type }}
     - name: Setup gradle

.github/workflow-scripts/__tests__/createDraftRelease-test.js

@@ -188,6 +188,7 @@ View the whole changelog in the [CHANGELOG.md file](https://github.com/facebook/
           status: 201,
           json: () =>
             Promise.resolve({
+              id: 1,
               html_url:
                 'https://github.com/facebook/react-native/releases/tag/v0.77.1',
             }),
@@ -208,9 +209,11 @@ View the whole changelog in the [CHANGELOG.md file](https://github.com/facebook/
           body: fetchBody,
         },
       );
-      expect(response).toEqual(
-        'https://github.com/facebook/react-native/releases/tag/v0.77.1',
-      );
+      expect(response).toEqual({
+        id: 1,
+        html_url:
+          'https://github.com/facebook/react-native/releases/tag/v0.77.1',
+      });
     });
 
     it('creates a draft release for prerelease on GitHub', async () => {
@@ -238,6 +241,7 @@ View the whole changelog in the [CHANGELOG.md file](https://github.com/facebook/
           status: 201,
           json: () =>
             Promise.resolve({
+              id: 1,
               html_url:
                 'https://github.com/facebook/react-native/releases/tag/v0.77.1',
             }),
@@ -258,9 +262,11 @@ View the whole changelog in the [CHANGELOG.md file](https://github.com/facebook/
           body: fetchBody,
         },
       );
-      expect(response).toEqual(
-        'https://github.com/facebook/react-native/releases/tag/v0.77.1',
-      );
+      expect(response).toEqual({
+        id: 1,
+        html_url:
+          'https://github.com/facebook/react-native/releases/tag/v0.77.1',
+      });
     });
 
     it('throws if the post failes', async () => {

.github/workflow-scripts/createDraftRelease.js

@@ -101,7 +101,11 @@ async function _createDraftReleaseOnGitHub(version, body, latest, token) {
   }
 
   const data = await response.json();
-  return data.html_url;
+  const {html_url, id} = data;
+  return {
+    html_url,
+    id,
+  };
 }
 
 function moveToChangelogBranch(version) {
@@ -124,7 +128,8 @@ async function createDraftRelease(version, latest, token) {
     latest,
     token,
   );
-  log(`Created draft release: ${release}`);
+  log(`Created draft release: ${release.html_url}, ID ${release.id}`);
+  return release;
 }
 
 module.exports = {

.github/workflows/create-draft-release.yml

@@ -21,9 +21,24 @@ jobs:
           git config --local user.name "React Native Bot"
       - name: Create draft release
         uses: actions/github-script@v6
+        id: create-draft-release
         with:
           script: |
             const {createDraftRelease} = require('./.github/workflow-scripts/createDraftRelease.js');
             const version = '${{ github.ref_name }}';
             const {isLatest} = require('./.github/workflow-scripts/publishTemplate.js');
-            await createDraftRelease(version, isLatest(), '${{secrets.REACT_NATIVE_BOT_GITHUB_TOKEN}}');
+            return (await createDraftRelease(version, isLatest(), '${{secrets.REACT_NATIVE_BOT_GITHUB_TOKEN}}')).id;
+          result-encoding: string
+      - name: Upload release assets for DotSlash
+        uses: actions/github-script@v6
+        env:
+          RELEASE_ID: ${{ steps.create-draft-release.outputs.result }}
+        with:
+          script: |
+            const {uploadReleaseAssetsForDotSlashFiles} = require('./scripts/releases/upload-release-assets-for-dotslash.js');
+            const version = '${{ github.ref_name }}';
+            await uploadReleaseAssetsForDotSlashFiles({
+              version,
+              token: '${{secrets.REACT_NATIVE_BOT_GITHUB_TOKEN}}',
+              releaseId: process.env.RELEASE_ID,
+            });

.github/workflows/create-release.yml

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

.github/workflows/nightly.yml

@@ -23,6 +23,7 @@ jobs:
 
   prepare_hermes_workspace:
     runs-on: ubuntu-latest
+    if: github.repository == 'facebook/react-native'
     env:
       HERMES_WS_DIR: /tmp/hermes
       HERMES_VERSION_FILE: packages/react-native/sdks/.hermesversion
@@ -50,8 +51,8 @@ jobs:
       - name: Build HermesC Apple
         uses: ./.github/actions/build-hermesc-apple
         with:
-          hermes-version: ${{ needs.prepare_hermes_workspace.output.hermes-version }}
-          react-native-version: ${{ needs.prepare_hermes_workspace.output.react-native-version }}
+          hermes-version: ${{ needs.prepare_hermes_workspace.outputs.hermes-version }}
+          react-native-version: ${{ needs.prepare_hermes_workspace.outputs.react-native-version }}
 
   build_apple_slices_hermes:
     runs-on: macos-14
@@ -75,7 +76,7 @@ jobs:
         uses: ./.github/actions/build-apple-slices-hermes
         with:
           flavor: ${{ matrix.flavor }}
-          slice: ${{ matrix.slice}}
+          slice: ${{ matrix.slice }}
           hermes-version: ${{ needs.prepare_hermes_workspace.outputs.hermes-version }}
           react-native-version: ${{ needs.prepare_hermes_workspace.outputs.react-native-version }}
 
@@ -101,6 +102,7 @@ jobs:
           flavor: ${{ matrix.flavor }}
 
   prebuild_apple_dependencies:
+    if: github.repository == 'facebook/react-native'
     uses: ./.github/workflows/prebuild-ios-dependencies.yml
     secrets: inherit
 
@@ -145,6 +147,7 @@ jobs:
 
   build_android:
     runs-on: 8-core-ubuntu
+    if: github.repository == 'facebook/react-native'
     needs: [set_release_type]
     container:
       image: reactnativecommunity/react-native-android:latest

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

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

.github/workflows/publish-release.yml

@@ -21,6 +21,7 @@ jobs:
 
   prepare_hermes_workspace:
     runs-on: ubuntu-latest
+    if: github.repository == 'facebook/react-native'
     env:
       HERMES_WS_DIR: /tmp/hermes
       HERMES_VERSION_FILE: packages/react-native/sdks/.hermesversion
@@ -98,6 +99,7 @@ jobs:
           flavor: ${{ matrix.flavor }}
 
   prebuild_apple_dependencies:
+    if: github.repository == 'facebook/react-native'
     uses: ./.github/workflows/prebuild-ios-dependencies.yml
     secrets: inherit
 

.github/workflows/retry-workflow.yml

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

.github/workflows/test-all.yml

@@ -11,6 +11,7 @@ on:
 jobs:
   set_release_type:
     runs-on: ubuntu-latest
+    if: github.repository == 'facebook/react-native'
     outputs:
       RELEASE_TYPE: ${{ steps.set_release_type.outputs.RELEASE_TYPE }}
     env:
@@ -34,6 +35,7 @@ jobs:
 
   prepare_hermes_workspace:
     runs-on: ubuntu-latest
+    if: github.repository == 'facebook/react-native'
     env:
       HERMES_WS_DIR: /tmp/hermes
       HERMES_VERSION_FILE: packages/react-native/sdks/.hermesversion
@@ -112,6 +114,7 @@ jobs:
           flavor: ${{ matrix.flavor }}
 
   prebuild_apple_dependencies:
+    if: github.repository == 'facebook/react-native'
     uses: ./.github/workflows/prebuild-ios-dependencies.yml
     secrets: inherit
 
@@ -273,7 +276,8 @@ jobs:
           NEW_ARCH_ENABLED=1
 
           export RCT_USE_LOCAL_RN_DEP=/tmp/third-party/ReactNativeDependencies${{ matrix.flavor }}.xcframework.tar.gz
-          export RCT_TESTONLY_RNCORE_TARBALL_PATH="/tmp/ReactCore/ReactCore${{ matrix.flavor }}.xcframework.tar.gz"
+          # Disable prebuilds for now, as they are causing issues with E2E tests for 0.82-stable branch
+          # export RCT_TESTONLY_RNCORE_TARBALL_PATH="/tmp/ReactCore/ReactCore${{ matrix.flavor }}.xcframework.tar.gz"
           HERMES_ENGINE_TARBALL_PATH=$HERMES_PATH RCT_NEW_ARCH_ENABLED=$NEW_ARCH_ENABLED bundle exec pod install
 
           xcodebuild \
@@ -594,6 +598,7 @@ jobs:
 
   test_js:
     runs-on: ubuntu-latest
+    if: github.repository == 'facebook/react-native'
     strategy:
       fail-fast: false
       matrix:
@@ -608,6 +613,7 @@ jobs:
 
   lint:
     runs-on: ubuntu-latest
+    if: github.repository == 'facebook/react-native'
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:

.github/workflows/validate-dotslash-artifacts.yml

@@ -0,0 +1,49 @@
+name: Validate DotSlash Artifacts
+
+on:
+  workflow_dispatch:
+  release:
+    types: [published]
+  push:
+    branches:
+      - main
+    paths:
+      - packages/debugger-shell/bin/react-native-devtools
+      - "scripts/releases/**"
+      - package.json
+      - yarn.lock
+  pull_request:
+    branches:
+      - main
+    paths:
+      - packages/debugger-shell/bin/react-native-devtools
+      - "scripts/releases/**"
+      - package.json
+      - yarn.lock
+  # Same time as the nightly build: 2:15 AM UTC
+  schedule:
+    - cron: "15 2 * * *"
+
+jobs:
+  validate-dotslash-artifacts:
+    runs-on: ubuntu-latest
+    if: github.repository == 'facebook/react-native'
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+      - name: Install dependencies
+        uses: ./.github/actions/yarn-install
+      - name: Configure Git
+        shell: bash
+        run: |
+          git config --local user.email "bot@reactnative.dev"
+          git config --local user.name "React Native Bot"
+      - name: Validate DotSlash artifacts
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const {validateDotSlashArtifacts} = require('./scripts/releases/validate-dotslash-artifacts.js');
+            await validateDotSlashArtifacts();

.gitignore

@@ -133,6 +133,7 @@ vendor/
 # Swift Package build folder
 /packages/react-native/.build
 /packages/react-native/.swiftpm
+/packages/react-native/React/includes/
 
 # @react-native/codegen
 /packages/react-native/React/FBReactNativeSpec/

CHANGELOG.md

@@ -1,5 +1,278 @@
 # Changelog
 
+## v0.81.4
+
+### Fixed
+
+#### iOS specific
+
+- Fix regression that skips artifacts code generation ([f6f5ea0b2e](https://github.com/facebook/react-native/commit/f6f5ea0b2eed894725d8f6e8bd045c99c3182026) by [@kitten](https://github.com/kitten))
+- Reapplied "Use autolinking-generated react-native-config output in second step of cocoapods linking that generates artifacts and generated source" ([bb73315a3f](https://github.com/facebook/react-native/commit/bb73315a3fd8cd203c4ddb3ffa10bfec307c7e92) by [@kitten](https://github.com/kitten))
+
+## v0.82.0-rc.4
+
+### Fixed
+
+- **Hermes V1:** Fixed coordinates for Hermes V1 artifacts ([674fb77d93](https://github.com/facebook/react-native/commit/674fb77d93dfe67a5fe90449dc71b195b1851e13) by [@j-piasecki](https://github.com/j-piasecki))
+
+#### iOS specific
+
+- **Switch:** Fix Switch layout to work with iOS26 ([91d427fe52](https://github.com/facebook/react-native/commit/91d427fe52a307f9aa8579912ef956d61808dad2) by [@cipolleschi](https://github.com/cipolleschi))
+
+## v0.82.0-rc.3
+
+### Added
+
+- **Hermes V1:** Added a dependency on hermes-compiler ([0caf8e70d5](https://github.com/facebook/react-native/commit/0caf8e70d53f611a73ad9b55879dfe0a5f036371) by [@j-piasecki](https://github.com/j-piasecki))
+
+### Fixed
+
+#### Android specific
+
+- **Hermes V1:** Changed the coordinates of hermes artifacts when using Hermes V1 ([d0fb33822d](https://github.com/facebook/react-native/commit/d0fb33822de38183895c8b3421f46966909beaf3) by [@j-piasecki](https://github.com/j-piasecki))
+
+#### iOS specific
+
+- **Codegen:** Fix regression that skips artifacts code generation ([f6f5ea0b2e](https://github.com/facebook/react-native/commit/f6f5ea0b2eed894725d8f6e8bd045c99c3182026) by [@kitten](https://github.com/kitten))
+
+## v0.81.3
+
+### Fixed
+
+#### iOS specific
+
+- Reverted "Use autolinking-generated react-native-config output in second step of cocoapods linking that generates artifacts and generated source" ([537e3ad930](https://github.com/facebook/react-native/commit/537e3ad93041c0cef959f0d20586fe97818900a6) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
+## v0.81.2
+
+### Added
+
+#### Android specific
+
+- Create a debugOptimized buildType for Android ([5e3edafec6](https://github.com/facebook/react-native/commit/5e3edafec6c69558521061dced7a6bcd046576b0) by [@cortinico](https://github.com/cortinico))
+- Add `useNativeEqualsInNativeReadableArrayAndroid` and `useNativeTransformHelperAndroid` feature flag to the experimental channel. This should alleviate some of the perf issue users are seeing on Android + Reanimated + NewArch on 0.81([a346096da8](https://github.com/facebook/react-native/commit/a346096da81fccf5fbc82d83bfc128695e6ec3a5) by [@cortinico](https://github.com/cortinico))
+
+### Fixed
+
+#### iOS specific
+
+- Fix Node scripts related to prebuilt tarball extraction for paths containing whitespaces ([366f2ad505](https://github.com/facebook/react-native/commit/366f2ad5057ffecc1f5b211f6aae29567ae6b7e5) by [@kitten](https://github.com/kitten))
+- Use autolinking-generated react-native-config output in second step of cocoapods linking that generates artifacts and generated source ([a2eb29e5e7](https://github.com/facebook/react-native/commit/a2eb29e5e7aef8bbdf4c647c8467b5292b013b20) by [@kitten](https://github.com/kitten))
+
+## v0.82.0-rc.1
+
+### Added
+
+#### Android specific
+
+- **Hermes V1:** Added opt-in to use the new Hermes ([3e9990f860](https://github.com/facebook/react-native/commit/3e9990f860eb9380837ef431ca02def32c4261ad) by [@j-piasecki](https://github.com/j-piasecki))
+
+#### iOS specific
+
+- **Hermes V1:** Added opt-in to use the new Hermes ([e9cdc308b4](https://github.com/facebook/react-native/commit/e9cdc308b4c04753d85757e8877ac00c3c687b95) by [@j-piasecki](https://github.com/j-piasecki))
+
+### Changed
+
+- **Hermes V1:** Changed the source of hermesc binary to be an npm package ([2e0bd13a25](https://github.com/facebook/react-native/commit/2e0bd13a2533fe7ab64125a95b9215b806018c6e) by [@j-piasecki](https://github.com/j-piasecki))
+
+### Deprecated
+
+- **APIs:** Deprecate legacy javascript react native apis ([e7aeea26bd](https://github.com/facebook/react-native/commit/e7aeea26bde6e9cda0a3a0a55fc2a0421fb0c0e5) by [@RSNara](https://github.com/RSNara))
+
+### Fixed
+
+#### Android specific
+
+- **Build From Source:** Fix build from source due to missing folder error on Gradle 9.0 ([9fbce3eff1](https://github.com/facebook/react-native/commit/9fbce3eff18060f16e796badc415ba733ede19af) by [@cortinico](https://github.com/cortinico))
+
+#### iOS specific
+
+- **RCTAlertController:** Simplify RCTAlertController, don't create additional UIWindow ([05c4321b19](https://github.com/facebook/react-native/commit/05c4321b194c3d0e146b6085bcaccc75acd3fd67) by [@okwasniewski](https://github.com/okwasniewski))
+- **Prebuild:** Fix Node scripts related to prebuilt tarball extraction for paths containing whitespaces ([9731e8ebc5](https://github.com/facebook/react-native/commit/9731e8ebc5ea87526a91b9903172639e062cd920) by [@kitten](https://github.com/kitten))
+- **Prebuild:** Use autolinking-generated react-native-config output in second step of cocoapods linking that generates artifacts and generated source ([f170db412b](https://github.com/facebook/react-native/commit/f170db412b3ab46fd0894d5d66431d9c230cd3a8) by [@kitten](https://github.com/kitten))
+
+## v0.82.0-rc.0
+
+### Breaking
+
+- **Appearance.setColorScheme:** `Appearance.setColorScheme` no longer accepts a nullable value ([a4581ecd8b](https://github.com/facebook/react-native/commit/a4581ecd8b6df5efa44dfe6d43708320209c900b) by [@huntie](https://github.com/huntie))
+- **`CxxSharedModuleWrapper`:** Removed CxxSharedModuleWrapper ([fafbee2402](https://github.com/facebook/react-native/commit/fafbee240235ea0e63eb01abd31ce32d6a576429) by [@javache](https://github.com/javache))
+- **DOM API:** Enable DOM APIs in host component refs ([2ad845ccb2](https://github.com/facebook/react-native/commit/2ad845ccb2fea277e05513dcf41407026a8224f0) by [@rubennorte](https://github.com/rubennorte))
+- **Error Handling:** Unhandled promises are now handled by ExceptionsManager.handleException, instead of being swallowed as Logbox Warnings. ([c4082c9ce2](https://github.com/facebook/react-native/commit/c4082c9ce208a324c2d011823ca2ba432411aafc) by [@krystofwoldrich](https://github.com/krystofwoldrich))
+- **`shouldEmitW3CPointerEvents`:** Migrate `shouldPressibilityUseW3CPointerEventsForHover` to common private feature flags and remove `shouldEmitW3CPointerEvents` flag. ([fb4587780e](https://github.com/facebook/react-native/commit/fb4587780e8d6111139d73598a9a26ff392dee28) by [@coado](https://github.com/coado))
+- **TurboModuleUtils:** Remove unused ReactCommon/TurboModuleUtils functions #deepCopyJSIObject and #deepCopyJSIArray ([ead669ade3](https://github.com/facebook/react-native/commit/ead669ade31ee703c407f96c0ce98d8f2991bdc8) by [@christophpurrer](https://github.com/christophpurrer))
+- **TurboModules:** Delete old location of CallbackWrapper.h / LongLivedObject.h by ([cb94e71](https://github.com/facebook/react-native/commit/cb94e71845259ae7fa823eb4d21cde74fccd7435) [@christophpurrer](https://github.com/christophpurrer))
+
+#### Android specific
+
+- **Deps:** Gradle to 9.0 ([7f93b664b4](https://github.com/facebook/react-native/commit/7f93b664b41ba11226aae7cca0e7c9b7f38a7d18) by [@cortinico](https://github.com/cortinico))
+- **Image Prefetching:** Android: Image Prefetching send ImageResizeMode as enum value ([e30f34eda6](https://github.com/facebook/react-native/commit/e30f34eda689994cab8cd62aa38175238da8638b) by [@christophpurrer](https://github.com/christophpurrer))
+- **New Architecture:** Remove possibility to newArchEnabled=false in 0.82 ([d5d21d0614](https://github.com/facebook/react-native/commit/d5d21d061493ee973c789a7c6ab8cceebc1f04f9) by [@cortinico](https://github.com/cortinico))
+- **`reactNativeHost`:** Throw Exception if ReactApplication.reactNativeHost is not overriden ([0d3791ca0a](https://github.com/facebook/react-native/commit/0d3791ca0ab30d5a12881c9901f31291b3e998c6) by [@mdvacca](https://github.com/mdvacca))
+- **ViewManagerInterfaces:** Migrate ViewManagerInterfaces to kotlin. Some types in code generated ViewManagerInterfaces might differ. e.g. this will start enforcing nullability in parameters of viewManagerInterface methods (e.g. String commands parameters are not nullable, view params are not nullable in any method, etc) ([79ca9036d3](https://github.com/facebook/react-native/commit/79ca9036d39c16cd115dc0427cb7092f358ac47e) by [@mdvacca](https://github.com/mdvacca))
+
+#### iOS Specific
+- **New Architecture:** Removed the opt-out from the New Architecture. ([83e6eaf693](https://github.com/facebook/react-native/commit/83e6eaf693f967b7870a5d4896cbb799206a14f0) by [@cipolleschi](https://github.com/cipolleschi))
+
+### Added
+
+- **Animated:** `Animated.CompositeAnimation` is now exposed when using `"react-native-strict-api"` ([024d25794a](https://github.com/facebook/react-native/commit/024d25794a51c94c877c1dfa115a82ebbf559614) by [@huntie](https://github.com/huntie))
+- **Animated:** Allow calling createAnimatedNode without batching ([d9d9a49e18](https://github.com/facebook/react-native/commit/d9d9a49e18f3c51caa18cf7da0a1fcd62f1ecf18) by [@zeyap](https://github.com/zeyap))
+- **Animated:** Allow filter usage with native animated driver. ([138d0eb01d](https://github.com/facebook/react-native/commit/138d0eb01dbe597261459a37d364d1780c3ef228) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
+- **API:** Expose NativeComponentRegistry API as JavaScript root export ([f936780cd5](https://github.com/facebook/react-native/commit/f936780cd5c0c17797f9d2bbc8f5cee81c2eefce) by [@zhongwuzw](https://github.com/zhongwuzw))
+- **API:** Expose `ReactNativeVersion` API as JavaScript root export ([ec5638abd0](https://github.com/facebook/react-native/commit/ec5638abd0e872be62b6ea5d8df9bed6335c2191) by [@huntie](https://github.com/huntie))
+- **Codegen:** Added getDebugProps to codegen ([e547f466ee](https://github.com/facebook/react-native/commit/e547f466ee41415a75ec6b6f910171285ee7bfc3) by [@cipolleschi](https://github.com/cipolleschi))
+- **Pressable:** Allow setting `blockNativeResponder` on Pressable ([6e4d23ded2](https://github.com/facebook/react-native/commit/6e4d23ded2da4a717bafcc032e3d7a0a5fbe3731) by [@zeyap](https://github.com/zeyap))
+- **Yoga/API:** Make yoga/Yoga.h an umbrell header ([8ed2cee80e](https://github.com/facebook/react-native/commit/8ed2cee80e0aaac2f2a6a897ba450888f274a5a4) by [@rudybear](https://github.com/rudybear))
+
+#### Android specific
+
+- **Build Type:** Create a `debugOptimized` `buildType` for Android ([eb2461c7c9](https://github.com/facebook/react-native/commit/eb2461c7c902ebed272bd2d22d6cff4d3c586da6) by [@cortinico](https://github.com/cortinico))
+- **DevMenu:** Add long-press back as an option to open the DevMenu for devices that lack menu & fast-forward. ([32d37f03ad](https://github.com/facebook/react-native/commit/32d37f03ad05290205a4f04d756f6e1880c4ff89) by [@sbuggay](https://github.com/sbuggay))
+- **DevTools:** `DevSupportManager::openDebugger` now supports an optional `panel` param determining the starting panel ([7eb3536728](https://github.com/facebook/react-native/commit/7eb3536728c4a20f7e51245f4f7b64aa505bd799) by [@huntie](https://github.com/huntie))
+- **DevTools:** Adds a landing view parameter to opening RNDT, enabling arbitrary view focus on launch. ([635c707eec](https://github.com/facebook/react-native/commit/635c707eec18f6d2ceceac2dcee9f458f17f8aab) by [@sbuggay](https://github.com/sbuggay))
+- **HWInput:** Channel up/down hardware events. ([c2a3e4420e](https://github.com/facebook/react-native/commit/c2a3e4420e07147f9a040a665da98dbe22b87a2a) by [@sbuggay](https://github.com/sbuggay))
+- **Manifest:** Add support to specify a single Manifest rather than 2 (main/debug) by using the `usesCleartextTraffic` manifest placeholder which is autoconfigured by RNGP. ([d89acc1596](https://github.com/facebook/react-native/commit/d89acc1596345534882938d2bbf40275a6cb89bd) by [@cortinico](https://github.com/cortinico))
+
+#### iOS specific
+
+- **API:** Add deprecation message for RCTAppdelegate APIs ([d503ea4efc](https://github.com/facebook/react-native/commit/d503ea4efc84b6511cef2a46421a16e044862e88) by [@cipolleschi](https://github.com/cipolleschi))
+- **New Architecture:** Add warning if RCT_NEW_ARCH_ENABLED is set to 0 ([7d0bef2f25](https://github.com/facebook/react-native/commit/7d0bef2f25a206d917e7f5cc2b9a6c088f13a832) by [@cipolleschi](https://github.com/cipolleschi))
+
+### Changed
+
+- **Font:** Enabled `enableFontScaleChangesUpdatingLayout` feature flag by default ([686d14f1d1](https://github.com/facebook/react-native/commit/686d14f1d16c2f02720104ddd395f7d27c908350) by [@j-piasecki](https://github.com/j-piasecki))
+- **Hermes:** Changed names of hermes binaries ([776fca1e7c](https://github.com/facebook/react-native/commit/776fca1e7c978a2d8f817d042836073e4dcb4e0e) by [@j-piasecki](https://github.com/j-piasecki))
+- **Metro:** Bump Metro to ^0.83.1 ([840fd6c83f](https://github.com/facebook/react-native/commit/840fd6c83f45326a796bf2823f8c2fa942aed06c) by [@robhogan](https://github.com/robhogan))
+- **React:** Bumped React to 19.1.1 ([ec5a98b1f5](https://github.com/facebook/react-native/commit/ec5a98b1f5c2137f5f6ff5f5f6706f20384c44df) by [@cipolleschi](https://github.com/cipolleschi))
+- **Runtime:** CDP backend now accepts `addBinding` and `removeBinding` methods earlier, before a Runtime exists. ([3271e57c75](https://github.com/facebook/react-native/commit/3271e57c751e7d1193c1e9f7b53e545231511b9d) by [@motiz88](https://github.com/motiz88))
+- **Typing:** Update types for Platform.version ([f6ba2dbf3b](https://github.com/facebook/react-native/commit/f6ba2dbf3b4c85da1a7f9079fd366a41b160fa69) by [@riteshshukla04](https://github.com/riteshshukla04))
+- **UIManager:** Avoid unnecessary copy of view props map in UIManager::updateShadowTree ([5b38bb4745](https://github.com/facebook/react-native/commit/5b38bb47457f853c2c3d5f275facbb9fbc150683) by [@zeyap](https://github.com/zeyap))
+
+#### Android specific
+
+- **AGP:** AGP to 8.12.0 ([742ef3d661](https://github.com/facebook/react-native/commit/742ef3d6615c8c1202e9f683e6127ac97d7a9e23) by [@cortinico](https://github.com/cortinico))
+- **DevSupportManager:** DevSupport `openDebugger()` methods now accept a `panel: String?` param. Frameworks directly implementing `DevSupportManager` will need to adjust call signatures. ([9dba7112cf](https://github.com/facebook/react-native/commit/9dba7112cfd09b02300869a77dba3dca16f49a28) by [@huntie](https://github.com/huntie))
+- **Kotlin:** Migrated TextAttributeProps to Kotlin. You might need to update your property access to use camelCase instead of Hungarian notation. ([fa921b3c7b](https://github.com/facebook/react-native/commit/fa921b3c7b289800a79196468f993a0eb0bf693f) by [@mateoguzmana](https://github.com/mateoguzmana))
+- **Kotlin:** Migrated ReactBaseTextShadowNode to Kotlin. You might need to update your property access to use camelCase instead of Hungarian notation. ([8ccfff9a46](https://github.com/facebook/react-native/commit/8ccfff9a46f317fd78f478c8b3f180441535d1ca) by [@mateoguzmana](https://github.com/mateoguzmana))
+- **Kotlin:** Migrated com.facebook.react.bridge.Arguments to Kotlin. ([2534aeaddb](https://github.com/facebook/react-native/commit/2534aeaddb0490b69dfaba6b8d316616c7e10a9c) by [@mateoguzmana](https://github.com/mateoguzmana))
+- **Kotlin:** Migrate `YogaConfig` to Kotlin ([4d5caef76b](https://github.com/facebook/react-native/commit/4d5caef76b83eb7e983364ecc81abb6027e5f98e) by [@mateoguzmana](https://github.com/mateoguzmana))
+- **Kotlin:** Migrate `YogaValue` to Kotlin ([4340dcbae8](https://github.com/facebook/react-native/commit/4340dcbae8fc41cde844e805a1ebfc23d23d164f) by [@mateoguzmana](https://github.com/mateoguzmana))
+- **Kotlin:** Migrate `YogaNative` to Kotlin ([bc54a06fcb](https://github.com/facebook/react-native/commit/bc54a06fcb5b5d1efd8996d8568733b657fc1b06) by [@mateoguzmana](https://github.com/mateoguzmana))
+- **Kotlin:** Migrate `YogaConfigFactory` to Kotlin ([33ca53d9db](https://github.com/facebook/react-native/commit/33ca53d9dbe53b92d65f82dbd53a2e9f23efd4f3) by [@mateoguzmana](https://github.com/mateoguzmana))
+- **Kotlin:** Migrate `DoNotStrip` to Kotlin ([35d8086881](https://github.com/facebook/react-native/commit/35d8086881fac643b0ebc0d53aaf7e79b7ccd830) by [@mateoguzmana](https://github.com/mateoguzmana))
+- **Kotlin:** Migrate `YogaLayoutType` to Kotlin ([7e461003c6](https://github.com/facebook/react-native/commit/7e461003c6592c8c539960bd5e8169c48dd27f50) by [@mateoguzmana](https://github.com/mateoguzmana))
+- **Kotlin:** Migrate `LayoutPassReason` to Kotlin ([db2a9c089c](https://github.com/facebook/react-native/commit/db2a9c089cd5802d99e0fc86e4dc0dbf7c888307) by [@mateoguzmana](https://github.com/mateoguzmana))
+- **Kotlin:** Migrate `YogaNodeFactory` to Kotlin ([40afa75a7c](https://github.com/facebook/react-native/commit/40afa75a7c816a5581223c7bcd1b65b8713edf47) by [@mateoguzmana](https://github.com/mateoguzmana))
+- **Kotlin:** Migrate `YogaMeasureOutput` to Kotlin ([453508ada8](https://github.com/facebook/react-native/commit/453508ada837554455733e3ca94440a7143f51b1) by [@mateoguzmana](https://github.com/mateoguzmana))
+- **Kotlin:** Migrate `YogaMeasureFunction` to Kotlin ([05eddd354e](https://github.com/facebook/react-native/commit/05eddd354e2e80ad3c95ed5a2199a59a77317891) by [@mateoguzmana](https://github.com/mateoguzmana))
+- **Kotlin:** Migrate `YogaStyleInputs` to Kotlin ([001736000f](https://github.com/facebook/react-native/commit/001736000f69ce98db86c17707408bbf3f0ae9a5) by [@mateoguzmana](https://github.com/mateoguzmana))
+- **Kotlin:** Migrate `YogaBaselineFunction` to Kotlin ([a2eb3b299d](https://github.com/facebook/react-native/commit/a2eb3b299dddea60c510821b662dfed55b334df7) by [@mateoguzmana](https://github.com/mateoguzmana))
+- **Kotlin:** Migrate `YogaLogger` to Kotlin ([9c9a39b58e](https://github.com/facebook/react-native/commit/9c9a39b58e12bc734c27a5d9306e792b0dcaf927) by [@mateoguzmana](https://github.com/mateoguzmana))
+- **OnBatchCompleteListener:** Make OnBatchCompleteListener interface internal ([046ff8e58b](https://github.com/facebook/react-native/commit/046ff8e58bed5da0f19adc860b327c7248b19f48) by [@cortinico](https://github.com/cortinico))
+- **ReactSurface:** Changed return type of ReactSurfaceImpl.view to ReactSurfaceView to align with parameter recived by ReactSurfaceImpl.attachView() ([41029d8e91](https://github.com/facebook/react-native/commit/41029d8e91492c34c377374b442b31755874618c) by [@mdvacca](https://github.com/mdvacca))
+- **TextAttributeProps:** Deprecate the field `TextAttributeProps.effectiveLineHeight`. This field was public but never used in OSS. ([ede037ade7](https://github.com/facebook/react-native/commit/ede037ade795bd44725f9bd82cace193a74aa68d) by [@cortinico](https://github.com/cortinico))
+- **ViewManagers:** Changed method arguments names for Core ViewManagers to match the names of ViewManagerInterfaces ([e7d9e0d197](https://github.com/facebook/react-native/commit/e7d9e0d1977c136a85b9a78ef36a258631d1e9ba) by [@mdvacca](https://github.com/mdvacca))
+
+### Deprecated
+
+- **StyleSheet:** `StyleSheet.absoluteFillObject` is deprecated in favor of `StyleSheet.absoluteFill` (equivalent). ([83e19813ff](https://github.com/facebook/react-native/commit/83e19813ff5498ab3497d97fe38dba63a5554425) by [@huntie](https://github.com/huntie))
+- Deprecate all the c++ classes not used by interop, or the new architecture. ([9539cd2626](https://github.com/facebook/react-native/commit/9539cd26261aef646379104833c7f719e3d83d02) by [@RSNara](https://github.com/RSNara))
+
+#### Android specific
+
+- **DevMenu:** Remove bridge mode string from React Native Dev Menu title ([1c838f32a9](https://github.com/facebook/react-native/commit/1c838f32a9bcee3867ec0502b344889308302f26) by [@sbuggay](https://github.com/sbuggay))
+- **New Architecture:** DefaultDevSupportManagerFactory.create() method used for Old Arch ([026e22bb8d](https://github.com/facebook/react-native/commit/026e22bb8d7b38b3bd66ffcc7d4ee446adfee943) by [@cortinico](https://github.com/cortinico))
+- **New Architecture:** Deprecate `BridgelessReactContext.getCatalystInstance()` method ([4583fbe052](https://github.com/facebook/react-native/commit/4583fbe052924df1ad030e51ad80e8d754a4c5a4) by [@cortinico](https://github.com/cortinico))
+- **New Architecture:** Deprecate legacy architecture classes ReactInstanceManager and ReactInstanceManagerBuilder, these classes will be deleted in a future release ([fb84932e48](https://github.com/facebook/react-native/commit/fb84932e4894a45c0a2725e1d665acdf7bcea435) by [@mdvacca](https://github.com/mdvacca))
+- **New Architecture:** Depreacate `CoreModulesPackage` and `NativeModuleRegistryBuilder` legacy architecture classes, these classes unused in the new architecture and will be deleted in the future ([d3bbbd893a](https://github.com/facebook/react-native/commit/d3bbbd893acd500237ab4e1778c6a2e0fe1948a9) by [@mdvacca](https://github.com/mdvacca))
+- **New Architecture:** Deprecate Legacy Architecture ViewManagers, these classes are not used as part of the new architecture and will be deleted in the future ([da74d5da2c](https://github.com/facebook/react-native/commit/da74d5da2cac5306e37368c65490c434e7ff9f4f) by [@mdvacca](https://github.com/mdvacca))
+- **New Architecture:** Deprecate LegacyArchitecture ShadowNode classes included in React Native ([07091a9ae8](https://github.com/facebook/react-native/commit/07091a9ae8d70a601d969d9def4952563d3b7bcf) by [@mdvacca](https://github.com/mdvacca))
+- **New Architecture:** Depreacte all LegacyArchitecture classes from the bridge package ([c1f7c5e321](https://github.com/facebook/react-native/commit/c1f7c5e3217a7e8a77a859652aadff2a41e3ea58) by [@mdvacca](https://github.com/mdvacca))
+- **New Architecture:** Deprecate LegacyArchitecture class UIManagerProvider ([b29b86f275](https://github.com/facebook/react-native/commit/b29b86f27553eac50daa18ffb6bca07be3f24f25) by [@mdvacca](https://github.com/mdvacca))
+- **New Architecture:** Deprecate BridgeDevSupportManager and JSInstance ([25c011eb4d](https://github.com/facebook/react-native/commit/25c011eb4d403040b57e338bec704769de20793c) by [@mdvacca](https://github.com/mdvacca))
+- **New Architecture:** Deprecate NativeModuleRegistry Legacy Architecture class ([22e4c25211](https://github.com/facebook/react-native/commit/22e4c252116da1a6658b15a84720e0ee314dddd6) by [@mdvacca](https://github.com/mdvacca))
+- **New Architecture:** Deprecate subset of LegacyArchitecture classes in com/facebook/react/bridge ([78a3ff81eb](https://github.com/facebook/react-native/commit/78a3ff81eb38ae26fb15106580de841477897101) by [@mdvacca](https://github.com/mdvacca))
+- **New Architecture:** Deprecate LegacyArchitecture class FrescoBasedReactTextInlineImageShadowNode ([25f466cc4d](https://github.com/facebook/react-native/commit/25f466cc4dd28c962b967475c04c284d26efb722) by [@mdvacca](https://github.com/mdvacca))
+- **New Architecture:** Deprecate Legacy Architecture class CallbackImpl ([718126fcf0](https://github.com/facebook/react-native/commit/718126fcf0296969ee659c31fae51b4317c896d3) by [@mdvacca](https://github.com/mdvacca))
+- **New Architecture:** Deprecate LegacyArchitecture class JavaMethodWrapper ([19a99dd088](https://github.com/facebook/react-native/commit/19a99dd0882d786daea3db486fd3aed3c10419b5) by [@mdvacca](https://github.com/mdvacca))
+- **New Architecture:** Deprecate Legacy Architecture ShadowNode classes ([c4715886a9](https://github.com/facebook/react-native/commit/c4715886a917eb3eb63aab366de5225090dff5a1) by [@mdvacca](https://github.com/mdvacca))
+- **New Architecture:** Deprecate LegacyArchitecture UIManagerModules class ([85610c8b43](https://github.com/facebook/react-native/commit/85610c8b43ea132154cddcfed973ee6ceb3e55b3) by [@mdvacca](https://github.com/mdvacca))
+- **New Architecture:** Deprecate LegacyArchitecture classes from com/facebook/react/uimanager ([7f5b2b8f84](https://github.com/facebook/react-native/commit/7f5b2b8f84d7941891a447978c6adc17929ef87f) by [@mdvacca](https://github.com/mdvacca))
+- **New Architecture:** Deprecate LegacyArchitecture classes from package com.facebook.react.uimanager ([39d24bade3](https://github.com/facebook/react-native/commit/39d24bade317920544a3715e3a1f131663d8cded) by [@mdvacca](https://github.com/mdvacca))
+- **New Architecture:** Deprecate LegacyArchitecture classes from LayoutAnimation package ([f67078df07](https://github.com/facebook/react-native/commit/f67078df07b6c9ad995eb43ff47fc4a43bb2eaee) by [@mdvacca](https://github.com/mdvacca))
+- **New Architecture:** ReactPackageLogger is not supported in the new architecture and being deprecated ([65671108f6](https://github.com/facebook/react-native/commit/65671108f69d9b23a011841102e4141293581d9c) by [@mdvacca](https://github.com/mdvacca))
+
+#### iOS specific
+
+- **DevMenu:** Remove bridge mode title and description from React Native Dev Menu title ([775daf5972](https://github.com/facebook/react-native/commit/775daf597280db94354ed484f2ce81690f1eb7b0) by [@sbuggay](https://github.com/sbuggay))
+- **New Architecture:** Deprecate all the objc classes not used by interop, or the new architecture. ([70f53ac4ea](https://github.com/facebook/react-native/commit/70f53ac4ea144020560906f5931e480ed4dee87c) by [@RSNara](https://github.com/RSNara))
+
+### Removed
+
+- **New Architecture:** Core: Remove legacy components ([9c8a4c2297](https://github.com/facebook/react-native/commit/9c8a4c22973c7ce6fcf6b5d22c6d5fd4c6dc0d92) by [@RSNara](https://github.com/RSNara))
+
+#### Android specific
+
+- **DefaultReactHost:** Delete unused `DefaultReactHost.getDefaultReactHost()` overload ([d35ddb5e59](https://github.com/facebook/react-native/commit/d35ddb5e59a8cb990dd61a154a8e15e9542f8b15) by [@cortinico](https://github.com/cortinico))
+- **DefaultReactHost:** Remove deprecated DefaultReactHost.getDefaultReactHost() overload - part 2 ([bda6acf3b0](https://github.com/facebook/react-native/commit/bda6acf3b08779c0dae7bdadbc9913eea79acd0d) by [@cortinico](https://github.com/cortinico))
+- **DefaultReactHost:** Remove deprecated DefaultReactHost.getDefaultReactHost() overload - part 1 ([474f455a75](https://github.com/facebook/react-native/commit/474f455a7591049382da0d0308ddd21589f0cc7e) by [@cortinico](https://github.com/cortinico))
+- **Inspector:** Removed unused `Inspector` public class from React Android ([cf528526cc](https://github.com/facebook/react-native/commit/cf528526cc375f1003125cf63f66fbd88790ceae) by [@cortinico](https://github.com/cortinico))
+- **JSONArguments:** Remove the `com.facebook.react.bridge.JSONArguments` class ([04ae15d99b](https://github.com/facebook/react-native/commit/04ae15d99bb2ee6f7987bbe8c3d7acfdd46a482f) by [@cortinico](https://github.com/cortinico))
+- **MessageQueueThreadPerfStats:** Deprecated MessageQueueThreadPerfStats API and replaced with stub. ([3bf5cb3d0e](https://github.com/facebook/react-native/commit/3bf5cb3d0e7d9d1749ef19a8392b9bbd3ec7ab7d) by [@javache](https://github.com/javache))
+
+### Fixed
+
+- **Accessibility:** Fix for setting the default value for accessibility props ([586f5ba89c](https://github.com/facebook/react-native/commit/586f5ba89cc20a81a9e2d5d0f2708e9cd1b440c0) by Vineeth K)
+- **Accessibility:** `aria-hidden` support for `Text`, non-editable `TextInput` and `Image` ([0f39fc3000](https://github.com/facebook/react-native/commit/0f39fc3000411a43711814e0ab9cca1f7093b625) by [@mdjastrzebski](https://github.com/mdjastrzebski))
+- **Build:** Fixed babel plugin validation error when coverage instrumentation is enabled ([191ddc1ec7](https://github.com/facebook/react-native/commit/191ddc1ec72be6641ebb8b9cb729cf0e142fff55) by Umar Mohammad)
+- **Casting:** Casting rawValue to int was incorrectly truncating ([31b9f10364](https://github.com/facebook/react-native/commit/31b9f103645e67586bdfc5c2f590c28c04ca3871) by [@javache](https://github.com/javache))
+- **Codegen:** Help Codegen find library's package.json if some libraries using `exports` field in their package.json file and the `./package.json` subpath is not explicitly defined ([739dfd2141](https://github.com/facebook/react-native/commit/739dfd2141015a8126448bda64a559f5bf22672e) by [@RakaDoank](https://github.com/RakaDoank))
+- **Hermes:** Change leftover references to `hermes.framework` to `hermesvm.framework` ([7f051c5470](https://github.com/facebook/react-native/commit/7f051c54701b3585f76f63846abbf7e68e2688d2) by [@j-piasecki](https://github.com/j-piasecki))
+- **Performance Panel:** Fix typo in Performance.js type checking condition ([6caf2dfa38](https://github.com/facebook/react-native/commit/6caf2dfa382fd4f1184b8d21b030c36687a256e4) by [@YangJonghun](https://github.com/YangJonghun))
+- **Performance Panel:** Add default cases to switch statements in headers ([323fe3a5d4](https://github.com/facebook/react-native/commit/323fe3a5d471ae5a2f94d5c2bd13cc97feffe0a5) by [@NSProgrammer](https://github.com/NSProgrammer))
+- **ReactCommon:** Bring back ContextContainer::Shared = std::shared_ptr<const ContextContainer> alias ([daeb6e99ab](https://github.com/facebook/react-native/commit/daeb6e99abbca2b6395a9a703d2b0bb9e5091fb7) by [@christophpurrer](https://github.com/christophpurrer))
+- **ReactCommon:** Bring back SharedImageManager = std::shared_ptr<ImageManager> alias ([4718b35259](https://github.com/facebook/react-native/commit/4718b35259135b3503033a0061ae84e15d4eb450) by [@christophpurrer](https://github.com/christophpurrer))
+- **ReactCommon:** Fixed Type Conversion Error in DynamicEventPayload ([ff38d59cff](https://github.com/facebook/react-native/commit/ff38d59cff92e0a50f0dd70384fbc4dd11d969c4) by Harini Malothu)
+- **ReactCommon:** Fixed Type Conversion Error in CSSHexColor ([2ca88a0069](https://github.com/facebook/react-native/commit/2ca88a0069969bf115da6f0ea9f2fbbae9c9226c) by [@anupriya13](https://github.com/anupriya13))
+- **TestCallInvoker:** Fix memory leak in TestCallInvoker ([9f2fbc23e4](https://github.com/facebook/react-native/commit/9f2fbc23e48af9be56b3729d514fbb3fff4ba376) by [@christophpurrer](https://github.com/christophpurrer))
+
+#### Android specific
+
+- **Accessability:** Stabilize custom accessibility action IDs to prevent "incompatible action" errors in TalkBack. ([626568f9a3](https://github.com/facebook/react-native/commit/626568f9a3f956a52f6c55df1dc3bc5cd017e353) by [@leg234-png](https://github.com/leg234-png))
+- **Determinism:** Turned off build IDs for native libraries, fixing issues with reproducibility ([4b8dbe7642](https://github.com/facebook/react-native/commit/4b8dbe7642be53d0ccfc68ca8c9b3f5e750a68c0) by [@Rexogamer](https://github.com/Rexogamer))
+- **DevTools:** Fix stack trace linkifying failing when using Android emulator and other situations where the device and debugger have different bundle urls ([794df48ad6](https://github.com/facebook/react-native/commit/794df48ad6a259022e66de1a38ff54b5ec67c3e4) by [@vzaidman](https://github.com/vzaidman))
+- **Edge to Edge:** Fix `Dimensions` `window` values on Android < 15 when edge-to-edge is enabled ([3b185e4bce](https://github.com/facebook/react-native/commit/3b185e4bcef24e0689cccd4cf250d469b114d4da) by [@zoontek](https://github.com/zoontek))
+- **Fonts:** Update font scale when recreating `RootView` ([5cda3065ce](https://github.com/facebook/react-native/commit/5cda3065ce635460a7458cbab5c10e24bea3bfe2) by [@j-piasecki](https://github.com/j-piasecki))
+- **Fonts:** Fix incorrect positioning of inline view at the end of string when RTL text in LTR container ([7f224941bb](https://github.com/facebook/react-native/commit/7f224941bb807919b487d8e1634dd2124f9258b8) by [@NickGerleman](https://github.com/NickGerleman))
+- **Locale:** Use the first available locale instead of the default one to decide `isDevicePreferredLanguageRTL` ([a03780d279](https://github.com/facebook/react-native/commit/a03780d279d0944e0dcbbf5a93680775006598b0) by Kaining Zhong)
+- **New Architecture:** Correctly account for insets on first render of Modals on New Arch ([2e76fc8e8e](https://github.com/facebook/react-native/commit/2e76fc8e8ea01fbce5bd131f675364e688f49088) by [@cortinico](https://github.com/cortinico))
+- **Performance:** Fix mounting is very slow on Android by shipping native transform optimizations ([c557311ed8](https://github.com/facebook/react-native/commit/c557311ed836cded8548c5bca32f3eded0abc7ff) by [@cortinico](https://github.com/cortinico))
+- **Scroll:** Fixed an issue where shadow tree and native tree layouts mismatch at the end of a scroll event ([1828c53f85](https://github.com/facebook/react-native/commit/1828c53f85faf599a485b3859f8b62586696265f) by [@Abbondanzo](https://github.com/Abbondanzo))
+- **Start up:** Fix wrong default for `jsBundleAssetPath` on `DefaultReactHost` ([2246e2b82c](https://github.com/facebook/react-native/commit/2246e2b82cf0c433f9a9b385ea98e532c6f322c6) by [@cortinico](https://github.com/cortinico))
+
+#### iOS specific
+
+- **Build:** Fixed using USE_FRAMEWORKS (static/dynamic) with precompiled binaries ([e723ca4d6b](https://github.com/facebook/react-native/commit/e723ca4d6b86d5a98449498395c700513ceba555) by [@chrfalch](https://github.com/chrfalch))
+- **Build:** Non-UTF8 crashes Info.plist local frameworks ([91e69b5d4c](https://github.com/facebook/react-native/commit/91e69b5d4c768278680a8d9ae979bc267624ce98) by [@philipheinser](https://github.com/philipheinser))
+- **Build:** Fixed variable naming error in `set_fast_float_config` method in `react_native_pods.rb` ([327057fad5](https://github.com/facebook/react-native/commit/327057fad5c78a95e6c039bfe380d78672e83a43) by [@eliotfallon213](https://github.com/eliotfallon213))
+- **Build:** Fix pure cocoapods dynamic framework build ([aa4555eaf1](https://github.com/facebook/react-native/commit/aa4555eaf1b6aab83660c600e867fa6c2da4128e) by [@cipolleschi](https://github.com/cipolleschi))
+- **Native Modules:** Fix concurrent calls into resolve/reject inside native modules ([dc879950d1](https://github.com/facebook/react-native/commit/dc879950d196dfd429229f1c4c8e743ef1799d11) by [@RSNara](https://github.com/RSNara))
+- **New Architecture:** Fix overriding (xc)framework Info.plist files with RCTNewArchEnabled field ([f84514a88b](https://github.com/facebook/react-native/commit/f84514a88be00f8dcae7972f84aa89d829392a58) by [@msynowski](https://github.com/msynowski))
+- **RCTPullToRefreshViewComponentView:** Properly initialize the `RCTPullToRefreshViewComponentView` ([27217e8bd6](https://github.com/facebook/react-native/commit/27217e8bd601757b5db6efc022db428b552a2aa4) by [@cipolleschi](https://github.com/cipolleschi))
+- **RCTReactNativeFactory:** Ask the delegate for `getModuleForClass` and `getModuleInstanceFromClass` ([85b47afb48](https://github.com/facebook/react-native/commit/85b47afb48e50b036d2c2c79a008f571d3bfcb43) by [@cipolleschi](https://github.com/cipolleschi))
+- **ScrollView:** Correctly propagate `ScrollView` props to `RefreshControl` ([09daad27ea](https://github.com/facebook/react-native/commit/09daad27ea22b83fab65176ea3c7f5f1488ba408) by [@cipolleschi](https://github.com/cipolleschi))
+- **ScrollView:** Make sure that `ScrollView` recycled refresh control have the right props setup. ([21b93d8d7d](https://github.com/facebook/react-native/commit/21b93d8d7d46a26f728df19764f85a8aebf318bb) by [@cipolleschi](https://github.com/cipolleschi))
+- **Switch:** Fixed a crash when rendering the `Switch` component ([28275a0f7b](https://github.com/facebook/react-native/commit/28275a0f7b182a215010d47fb841d9c2c36bb24c) by [@cipolleschi](https://github.com/cipolleschi))
+- **Text:** Fix selectable prop not working correctly ([f004cd39bc](https://github.com/facebook/react-native/commit/f004cd39bc4b632006085cbcf61df52bc5d25242) by [@iamAbhi-916](https://github.com/iamAbhi-916))
+- **TextInput:** Update TextInput recycling logic to clean up the `inputAccessoryView` dependency. ([eb08f54594](https://github.com/facebook/react-native/commit/eb08f545948de9e2eca91ab3cb7569670c553b15) by [@ArturKalach](https://github.com/ArturKalach))
+- **TextInput:** Fixed TextInput behavior when `maxLength={null}` is passed ([56ad53cb14](https://github.com/facebook/react-native/commit/56ad53cb14b5c842714fcf976b6ba81f68c140f2) by [@cipolleschi](https://github.com/cipolleschi))
+- **View:** Inline `View` alignment with `lineHeight` in Text ([6da351a5ed](https://github.com/facebook/react-native/commit/6da351a5ed80a10138a5558afcb380410c8a93c9) by [@intergalacticspacehighway](https://github.com/intergalacticspacehighway))
+
+### Security
+
+- **Network:** Fixed vulnerability on undici and on-headers ([dd00c9055a](https://github.com/facebook/react-native/commit/dd00c9055a8f0c9ceac1716385a8a9874f7a4c2e) by [@cipolleschi](https://github.com/cipolleschi))
+
 ## v0.81.1
 
 ### Added

README.md

@@ -17,10 +17,13 @@
     <img src="https://img.shields.io/npm/v/react-native?color=brightgreen&label=npm%20package" alt="Current npm package version." />
   </a>
   <a href="https://reactnative.dev/docs/contributing">
-    <img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs welcome!" />
+    <img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs are welcome!" />
   </a>
   <a href="https://twitter.com/intent/follow?screen_name=reactnative">
-    <img src="https://img.shields.io/twitter/follow/reactnative.svg?label=Follow%20@reactnative" alt="Follow @reactnative" />
+    <img src="https://img.shields.io/twitter/follow/reactnative.svg?label=Follow%20@reactnative" alt="Follow @reactnative on X" />
+  </a>
+  <a href="https://bsky.app/profile/reactnative.dev">
+    <img src="https://img.shields.io/badge/Bluesky-0285FF?logo=bluesky&logoColor=fff" alt="Follow @reactnative.dev on Bluesky" />
   </a>
 </p>
 

build.gradle.kts

@@ -135,6 +135,7 @@ if (project.findProperty("react.internal.useHermesNightly")?.toString()?.toBoole
     configurations.all {
       resolutionStrategy.dependencySubstitution {
         substitute(project(":packages:react-native:ReactAndroid:hermes-engine"))
+            // TODO: T237406039 update coordinates
             .using(module("com.facebook.react:hermes-android:0.+"))
             .because("Users opted to use hermes from nightly")
       }

flow-typed/environment/node.js

@@ -3057,30 +3057,30 @@ type util$InspectOptions = {
 };
 
 declare type util$ParseArgsOption =
-  | {|
+  | $ReadOnly<{|
       type: 'boolean',
       multiple?: false,
       short?: string,
       default?: boolean,
-    |}
-  | {|
+    |}>
+  | $ReadOnly<{|
       type: 'boolean',
       multiple: true,
       short?: string,
       default?: Array<boolean>,
-    |}
-  | {|
+    |}>
+  | $ReadOnly<{|
       type: 'string',
       multiple?: false,
       short?: string,
       default?: string,
-    |}
-  | {|
+    |}>
+  | $ReadOnly<{|
       type: 'string',
       multiple: true,
       short?: string,
       default?: Array<string>,
-    |};
+    |}>;
 
 type util$ParseArgsOptionToValue<TOption> = TOption['type'] extends 'boolean'
   ? TOption['multiple'] extends true
@@ -3137,7 +3137,7 @@ declare module 'util' {
   declare function stripVTControlCharacters(str: string): string;
 
   declare function parseArgs<
-    TOptions: {[string]: util$ParseArgsOption} = {||},
+    TOptions: {+[string]: util$ParseArgsOption} = {||},
   >(config: {|
     args?: Array<string>,
     options?: TOptions,
@@ -3995,13 +3995,16 @@ declare class Process extends events$EventEmitter {
   initgroups?: (user: number | string, extra_group: number | string) => void;
   kill(pid: number, signal?: string | number): void;
   mainModule: Object;
-  memoryUsage(): {
-    arrayBuffers: number,
-    rss: number,
-    heapTotal: number,
-    heapUsed: number,
-    external: number,
-    ...
+  memoryUsage: {
+    (): {
+      arrayBuffers: number,
+      rss: number,
+      heapTotal: number,
+      heapUsed: number,
+      external: number,
+      ...
+    },
+    rss: () => number,
   };
   nextTick: <T>(cb: (...T) => mixed, ...T) => void;
   pid: number;

flow-typed/npm/@expo/spawn-async_v1.x.x.js

@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+declare module '@expo/spawn-async' {
+  type SpawnOptions = {
+    cwd?: string,
+    env?: Object,
+    argv0?: string,
+    stdio?: string | Array<any>,
+    detached?: boolean,
+    uid?: number,
+    gid?: number,
+    shell?: boolean | string,
+    windowsVerbatimArguments?: boolean,
+    windowsHide?: boolean,
+    encoding?: string,
+    ignoreStdio?: boolean,
+  };
+
+  declare class SpawnPromise<T> extends Promise<T> {
+    child: child_process$ChildProcess;
+  }
+  type SpawnResult = {
+    pid?: number,
+    output: string[],
+    stdout: string,
+    stderr: string,
+    status: number | null,
+    signal: string | null,
+  };
+
+  declare function spawnAsync(
+    command: string,
+    args?: $ReadOnlyArray<string>,
+    options?: SpawnOptions,
+  ): SpawnPromise<SpawnResult>;
+
+  declare module.exports: typeof spawnAsync;
+}

flow-typed/npm/@octokit/rest_v22.x.x.js

@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+// Partial types for Octokit based on the usage in react-native-github
+declare module '@octokit/rest' {
+  declare class Octokit {
+    constructor(options?: {auth?: string, ...}): this;
+
+    repos: $ReadOnly<{
+      listReleaseAssets: (
+        params: $ReadOnly<{
+          owner: string,
+          repo: string,
+          release_id: string,
+        }>,
+      ) => Promise<{
+        data: Array<{
+          id: string,
+          name: string,
+          ...
+        }>,
+        ...
+      }>,
+      uploadReleaseAsset: (
+        params: $ReadOnly<{
+          owner: string,
+          repo: string,
+          release_id: string,
+          name: string,
+          data: Buffer,
+          headers: $ReadOnly<{
+            'content-type': string,
+            ...
+          }>,
+          ...
+        }>,
+      ) => Promise<{
+        data: {
+          browser_download_url: string,
+          ...
+        },
+        ...
+      }>,
+      deleteReleaseAsset: (params: {
+        owner: string,
+        repo: string,
+        asset_id: string,
+        ...
+      }) => Promise<mixed>,
+    }>;
+  }
+
+  declare export {Octokit};
+}

flow-typed/npm/fb-dotslash_v0.x.x.js

@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+declare module 'fb-dotslash' {
+  declare module.exports: string;
+}

flow-typed/npm/jsonc-parser_v2.2.x.js

@@ -0,0 +1,421 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+declare module 'jsonc-parser' {
+  /**
+   * Creates a JSON scanner on the given text.
+   * If ignoreTrivia is set, whitespaces or comments are ignored.
+   */
+  declare export const createScanner: (
+    text: string,
+    ignoreTrivia?: boolean,
+  ) => JSONScanner;
+  export type ScanError = number;
+  export type SyntaxKind = number;
+  /**
+   * The scanner object, representing a JSON scanner at a position in the input string.
+   */
+  export type JSONScanner = $ReadOnly<{
+    /**
+     * Sets the scan position to a new offset. A call to 'scan' is needed to get the first token.
+     */
+    setPosition(pos: number): void,
+    /**
+     * Read the next token. Returns the token code.
+     */
+    scan(): SyntaxKind,
+    /**
+     * Returns the zero-based current scan position, which is after the last read token.
+     */
+    getPosition(): number,
+    /**
+     * Returns the last read token.
+     */
+    getToken(): SyntaxKind,
+    /**
+     * Returns the last read token value. The value for strings is the decoded string content. For numbers it's of type number, for boolean it's true or false.
+     */
+    getTokenValue(): string,
+    /**
+     * The zero-based start offset of the last read token.
+     */
+    getTokenOffset(): number,
+    /**
+     * The length of the last read token.
+     */
+    getTokenLength(): number,
+    /**
+     * The zero-based start line number of the last read token.
+     */
+    getTokenStartLine(): number,
+    /**
+     * The zero-based start character (column) of the last read token.
+     */
+    getTokenStartCharacter(): number,
+    /**
+     * An error code of the last scan.
+     */
+    getTokenError(): ScanError,
+  }>;
+  /**
+   * For a given offset, evaluate the location in the JSON document. Each segment in the location path is either a property name or an array index.
+   */
+  declare export const getLocation: (
+    text: string,
+    position: number,
+  ) => Location;
+  /**
+   * Parses the given text and returns the object the JSON content represents. On invalid input, the parser tries to be as fault tolerant as possible, but still return a result.
+   * Therefore, always check the errors list to find out if the input was valid.
+   */
+  declare export const parse: (
+    text: string,
+    errors?: ParseError[],
+    options?: ParseOptions,
+  ) => any;
+  /**
+   * Parses the given text and returns a tree representation the JSON content. On invalid input, the parser tries to be as fault tolerant as possible, but still return a result.
+   */
+  declare export const parseTree: (
+    text: string,
+    errors?: ParseError[],
+    options?: ParseOptions,
+  ) => Node | void;
+  /**
+   * Finds the node at the given path in a JSON DOM.
+   */
+  declare export const findNodeAtLocation: (
+    root: Node,
+    path: JSONPath,
+  ) => Node | void;
+  /**
+   * Finds the innermost node at the given offset. If includeRightBound is set, also finds nodes that end at the given offset.
+   */
+  declare export const findNodeAtOffset: (
+    root: Node,
+    offset: number,
+    includeRightBound?: boolean,
+  ) => Node | void;
+  /**
+   * Gets the JSON path of the given JSON DOM node
+   */
+  declare export const getNodePath: (node: Node) => JSONPath;
+  /**
+   * Evaluates the JavaScript object of the given JSON DOM node
+   */
+  declare export const getNodeValue: (node: Node) => any;
+  /**
+   * Parses the given text and invokes the visitor functions for each object, array and literal reached.
+   */
+  declare export const visit: (
+    text: string,
+    visitor: JSONVisitor,
+    options?: ParseOptions,
+  ) => any;
+  /**
+   * Takes JSON with JavaScript-style comments and remove
+   * them. Optionally replaces every none-newline character
+   * of comments with a replaceCharacter
+   */
+  declare export const stripComments: (
+    text: string,
+    replaceCh?: string,
+  ) => string;
+  export type ParseError = {
+    error: ParseErrorCode,
+    offset: number,
+    length: number,
+  };
+  export type ParseErrorCode = number;
+  declare export function printParseErrorCode(
+    code: ParseErrorCode,
+  ):
+    | 'InvalidSymbol'
+    | 'InvalidNumberFormat'
+    | 'PropertyNameExpected'
+    | 'ValueExpected'
+    | 'ColonExpected'
+    | 'CommaExpected'
+    | 'CloseBraceExpected'
+    | 'CloseBracketExpected'
+    | 'EndOfFileExpected'
+    | 'InvalidCommentToken'
+    | 'UnexpectedEndOfComment'
+    | 'UnexpectedEndOfString'
+    | 'UnexpectedEndOfNumber'
+    | 'InvalidUnicode'
+    | 'InvalidEscapeCharacter'
+    | 'InvalidCharacter'
+    | '<unknown ParseErrorCode>';
+  export type NodeType =
+    | 'object'
+    | 'array'
+    | 'property'
+    | 'string'
+    | 'number'
+    | 'boolean'
+    | 'null';
+  export type Node = {
+    type: NodeType,
+    value?: any,
+    offset: number,
+    length: number,
+    colonOffset?: number,
+    parent?: Node,
+    children?: Node[],
+  };
+  /**
+   * A {@linkcode JSONPath} segment. Either a string representing an object property name
+   * or a number (starting at 0) for array indices.
+   */
+  export type Segment = string | number;
+  export type JSONPath = Segment[];
+  export type Location = {
+    /**
+     * The previous property key or literal value (string, number, boolean or null) or undefined.
+     */
+    previousNode?: Node,
+    /**
+     * The path describing the location in the JSON document. The path consists of a sequence of strings
+     * representing an object property or numbers for array indices.
+     */
+    path: JSONPath,
+    /**
+     * Matches the locations path against a pattern consisting of strings (for properties) and numbers (for array indices).
+     * '*' will match a single segment of any property name or index.
+     * '**' will match a sequence of segments of any property name or index, or no segment.
+     */
+    matches: (patterns: JSONPath) => boolean,
+    /**
+     * If set, the location's offset is at a property key.
+     */
+    isAtPropertyKey: boolean,
+  };
+  export type ParseOptions = {
+    disallowComments?: boolean,
+    allowTrailingComma?: boolean,
+    allowEmptyContent?: boolean,
+  };
+  /**
+   * Visitor called by {@linkcode visit} when parsing JSON.
+   *
+   * The visitor functions have the following common parameters:
+   * - `offset`: Global offset within the JSON document, starting at 0
+   * - `startLine`: Line number, starting at 0
+   * - `startCharacter`: Start character (column) within the current line, starting at 0
+   *
+   * Additionally some functions have a `pathSupplier` parameter which can be used to obtain the
+   * current `JSONPath` within the document.
+   */
+  export type JSONVisitor = {
+    /**
+     * Invoked when an open brace is encountered and an object is started. The offset and length represent the location of the open brace.
+     */
+    onObjectBegin?: (
+      offset: number,
+      length: number,
+      startLine: number,
+      startCharacter: number,
+      pathSupplier: () => JSONPath,
+    ) => void,
+    /**
+     * Invoked when a property is encountered. The offset and length represent the location of the property name.
+     * The `JSONPath` created by the `pathSupplier` refers to the enclosing JSON object, it does not include the
+     * property name yet.
+     */
+    onObjectProperty?: (
+      property: string,
+      offset: number,
+      length: number,
+      startLine: number,
+      startCharacter: number,
+      pathSupplier: () => JSONPath,
+    ) => void,
+    /**
+     * Invoked when a closing brace is encountered and an object is completed. The offset and length represent the location of the closing brace.
+     */
+    onObjectEnd?: (
+      offset: number,
+      length: number,
+      startLine: number,
+      startCharacter: number,
+    ) => void,
+    /**
+     * Invoked when an open bracket is encountered. The offset and length represent the location of the open bracket.
+     */
+    onArrayBegin?: (
+      offset: number,
+      length: number,
+      startLine: number,
+      startCharacter: number,
+      pathSupplier: () => JSONPath,
+    ) => void,
+    /**
+     * Invoked when a closing bracket is encountered. The offset and length represent the location of the closing bracket.
+     */
+    onArrayEnd?: (
+      offset: number,
+      length: number,
+      startLine: number,
+      startCharacter: number,
+    ) => void,
+    /**
+     * Invoked when a literal value is encountered. The offset and length represent the location of the literal value.
+     */
+    onLiteralValue?: (
+      value: any,
+      offset: number,
+      length: number,
+      startLine: number,
+      startCharacter: number,
+      pathSupplier: () => JSONPath,
+    ) => void,
+    /**
+     * Invoked when a comma or colon separator is encountered. The offset and length represent the location of the separator.
+     */
+    onSeparator?: (
+      character: string,
+      offset: number,
+      length: number,
+      startLine: number,
+      startCharacter: number,
+    ) => void,
+    /**
+     * When comments are allowed, invoked when a line or block comment is encountered. The offset and length represent the location of the comment.
+     */
+    onComment?: (
+      offset: number,
+      length: number,
+      startLine: number,
+      startCharacter: number,
+    ) => void,
+    /**
+     * Invoked on an error.
+     */
+    onError?: (
+      error: ParseErrorCode,
+      offset: number,
+      length: number,
+      startLine: number,
+      startCharacter: number,
+    ) => void,
+  };
+  /**
+   * An edit result describes a textual edit operation. It is the result of a {@linkcode format} and {@linkcode modify} operation.
+   * It consist of one or more edits describing insertions, replacements or removals of text segments.
+   * * The offsets of the edits refer to the original state of the document.
+   * * No two edits change or remove the same range of text in the original document.
+   * * Multiple edits can have the same offset if they are multiple inserts, or an insert followed by a remove or replace.
+   * * The order in the array defines which edit is applied first.
+   * To apply an edit result use {@linkcode applyEdits}.
+   * In general multiple EditResults must not be concatenated because they might impact each other, producing incorrect or malformed JSON data.
+   */
+  export type EditResult = Edit[];
+  /**
+   * Represents a text modification
+   */
+  export type Edit = {
+    /**
+     * The start offset of the modification.
+     */
+    offset: number,
+    /**
+     * The length of the modification. Must not be negative. Empty length represents an *insert*.
+     */
+    length: number,
+    /**
+     * The new content. Empty content represents a *remove*.
+     */
+    content: string,
+  };
+  /**
+   * A text range in the document
+   */
+  export type Range = {
+    /**
+     * The start offset of the range.
+     */
+    offset: number,
+    /**
+     * The length of the range. Must not be negative.
+     */
+    length: number,
+  };
+  /**
+   * Options used by {@linkcode format} when computing the formatting edit operations
+   */
+  export type FormattingOptions = $ReadOnly<{
+    /**
+     * If indentation is based on spaces (`insertSpaces` = true), the number of spaces that make an indent.
+     */
+    tabSize?: number,
+    /**
+     * Is indentation based on spaces?
+     */
+    insertSpaces?: boolean,
+    /**
+     * The default 'end of line' character. If not set, '\n' is used as default.
+     */
+    eol?: string,
+  }>;
+  /**
+   * Computes the edit operations needed to format a JSON document.
+   *
+   * @param documentText The input text
+   * @param range The range to format or `undefined` to format the full content
+   * @param options The formatting options
+   * @returns The edit operations describing the formatting changes to the original document following the format described in {@linkcode EditResult}.
+   * To apply the edit operations to the input, use {@linkcode applyEdits}.
+   */
+  declare export function format(
+    documentText: string,
+    range: Range | void,
+    options: FormattingOptions,
+  ): EditResult;
+  /**
+   * Options used by {@linkcode modify} when computing the modification edit operations
+   */
+  export type ModificationOptions = {
+    /**
+     * Formatting options.
+     */
+    formattingOptions: FormattingOptions,
+    /**
+     * Optional function to define the insertion index given an existing list of properties.
+     */
+    getInsertionIndex?: (properties: string[]) => number,
+  };
+  /**
+   * Computes the edit operations needed to modify a value in the JSON document.
+   *
+   * @param documentText The input text
+   * @param path The path of the value to change. The path represents either to the document root, a property or an array item.
+   * If the path points to an non-existing property or item, it will be created.
+   * @param value The new value for the specified property or item. If the value is undefined,
+   * the property or item will be removed.
+   * @param options Options
+   * @returns The edit operations describing the changes to the original document, following the format described in {@linkcode EditResult}.
+   * To apply the edit operations to the input, use {@linkcode applyEdits}.
+   */
+  declare export function modify(
+    text: string,
+    path: JSONPath,
+    value: any,
+    options: ModificationOptions,
+  ): EditResult;
+  /**
+   * Applies edits to an input string.
+   * @param text The input text
+   * @param edits Edit operations following the format described in {@linkcode EditResult}.
+   * @returns The text with the applied edits.
+   * @throws An error if the edit operations are not well-formed as described in {@linkcode EditResult}.
+   */
+  declare export function applyEdits(text: string, edits: EditResult): string;
+}

gradle.properties

@@ -12,3 +12,6 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # Controls whether to use Hermes from nightly builds. This will speed up builds
 # but should NOT be turned on for CI or release builds.
 react.internal.useHermesNightly=false
+
+# Controls whether to use Hermes 1.0. Clean and rebuild when changing.
+hermesV1Enabled=false

package.json

@@ -54,13 +54,16 @@
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-flow": "^7.24.7",
     "@electron/packager": "^18.3.6",
+    "@expo/spawn-async": "^1.7.2",
     "@jest/create-cache-key-function": "^29.7.0",
     "@microsoft/api-extractor": "^7.52.2",
+    "@octokit/rest": "^22.0.0",
     "@react-native/metro-babel-transformer": "0.82.0-main",
     "@react-native/metro-config": "0.82.0-main",
     "@tsconfig/node22": "22.0.2",
     "@types/react": "^19.1.0",
     "@typescript-eslint/parser": "^8.36.0",
+    "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.32.0",
@@ -81,8 +84,9 @@
     "eslint-plugin-react-native": "^4.0.0",
     "eslint-plugin-redundant-undefined": "^0.4.0",
     "eslint-plugin-relay": "^1.8.3",
+    "fb-dotslash": "0.5.8",
     "flow-api-translator": "0.32.0",
-    "flow-bin": "^0.280.0",
+    "flow-bin": "^0.286.0",
     "glob": "^7.1.1",
     "hermes-eslint": "0.32.0",
     "hermes-transform": "0.32.0",
@@ -93,9 +97,10 @@
     "jest-diff": "^29.7.0",
     "jest-junit": "^16.0.0",
     "jest-snapshot": "^29.7.0",
+    "jsonc-parser": "2.2.1",
     "markdownlint-cli2": "^0.17.2",
     "markdownlint-rule-relative-links": "^3.0.0",
-    "memfs": "^4.7.7",
+    "memfs": "^4.38.2",
     "metro-babel-register": "^0.83.1",
     "metro-transform-plugins": "^0.83.1",
     "micromatch": "^4.0.4",
@@ -107,12 +112,12 @@
     "react-test-renderer": "19.1.1",
     "rimraf": "^3.0.2",
     "shelljs": "^0.8.5",
-    "signedsource": "^1.0.0",
+    "signedsource": "^2.0.0",
     "supports-color": "^7.1.0",
     "temp-dir": "^2.0.0",
     "tinybench": "^4.1.0",
     "typescript": "5.8.3",
-    "ws": "^6.2.3"
+    "ws": "^7.5.10"
   },
   "resolutions": {
     "eslint-plugin-react-hooks": "6.1.0-canary-12bc60f5-20250613",

packages/community-cli-plugin/src/commands/start/runServer.js

@@ -119,7 +119,6 @@ async function runServer(
     watchFolders,
   });
   const {middleware, websocketEndpoints} = createDevMiddleware({
-    projectRoot,
     serverBaseUrl: devServerUrl,
     logger: createDevMiddlewareLogger(terminalReporter),
   });

packages/community-cli-plugin/src/utils/version.js

@@ -88,7 +88,6 @@ Diff: ${styleText(['dim', 'underline'], newVersion?.diffUrl ?? 'none')}
   }
 }
 
-// $FlowFixMe
 function isDiffPurgeEntry(data: Partial<DiffPurge>): data is DiffPurge {
   return (
     // $FlowFixMe[incompatible-type-guard]

packages/debugger-frontend/BUILD_INFO

@@ -1,5 +1,5 @@
-@generated SignedSource<<b6a779e724ecce5e727ee674dc20f809>>
-Git revision: e87564a24cf233c60aaebee8c418ec85724f7214
+@generated SignedSource<<e0cc45c5c3854d0d3013f1c735e804b8>>
+Git revision: 8cce39003f66f66a8fb4c0e581a2b5046cf9c1d1
 Built with --nohooks: false
 Is local checkout: false
 Remote URL: https://github.com/facebook/react-native-devtools-frontend

packages/debugger-frontend/dist/third-party/front_end/panels/protocol_monitor/protocol_monitor.js

@@ -238,7 +238,7 @@ import"../../ui/components/icon_button/icon_button.js";import"../../ui/component
                         <td>${e.method}</td>
                         <td>${e.params?d`<code>${JSON.stringify(e.params)}</code>`:""}</td>
                         <td>
-                          ${e.result?d`<code>${JSON.stringify(e.result)}</code>`:e.error?d`<code>${JSON.stringify(e.error)}</code>`:"(pending)"}
+                          ${e.result?d`<code>${JSON.stringify(e.result)}</code>`:e.error?d`<code>${JSON.stringify(e.error)}</code>`:"id"in e?"(pending)":""}
                         </td>
                         <td data-value=${e.elapsedTime||0}>
                           ${"id"in e?e.elapsedTime?U(A.sMs,{PH1:String(e.elapsedTime)}):"(pending)":""}

packages/debugger-frontend/dist/third-party/front_end/panels/timeline/components/components.js

@@ -983,7 +983,7 @@ import*as e from"../../../services/trace_bounds/trace_bounds.js";import*as t fro
 
         <p class="tooltip">${Ai(Oi.feedbackTooltip)}</p>
       </div>
-    `,n=s.Directives.repeat([i],(()=>this.#ve),(e=>e));s.render(n,this.#e,{host:this})}}customElements.define("devtools-performance-sidebar-insights",Ui);var Bi=Object.freeze({__proto__:null,SidebarInsightsTab:Ui});class qi extends Event{removedAnnotation;static eventName="removeannotation";constructor(e){super(qi.eventName,{bubbles:!0,composed:!0}),this.removedAnnotation=e}}class Vi extends Event{annotation;static eventName="revealannotation";constructor(e){super(Vi.eventName,{bubbles:!0,composed:!0}),this.annotation=e}}class ji extends r.Widget.VBox{#ri=new r.TabbedPane.TabbedPane;#tn=new Wi;#in=new Ki;#nn=a.Settings.Settings.instance().createSetting("timeline-user-has-opened-sidebar-once",!1);userHasOpenedSidebarOnce(){return this.#nn.get()}constructor(){super(),this.setMinimumSize(170,0),this.#ri.appendTab("insights","Insights",this.#tn,void 0,void 0,!1,!1,0,"timeline.insights-tab"),this.#ri.appendTab("annotations","Annotations",this.#in,void 0,void 0,!1,!1,1,"timeline.annotations-tab"),this.#ri.selectTab("insights")}wasShown(){this.#nn.set(!0),this.#ri.show(this.element),this.#rn(),"insights"===this.#ri.selectedTabId&&this.#ri.tabIsDisabled("insights")&&this.#ri.selectTab("annotations")}setAnnotations(e,t){this.#in.setAnnotations(e,t),this.#rn()}#rn(){const e=this.#in.deduplicatedAnnotations();this.#ri.setBadge("annotations",e.length>0?e.length.toString():null)}setParsedTrace(e,t){this.#tn.setParsedTrace(e,t)}setInsights(e){this.#tn.setInsights(e),this.#ri.setTabEnabled("insights",null!==e)}setActiveInsight(e){this.#tn.setActiveInsight(e),e&&this.#ri.selectTab("insights")}}class Wi extends r.Widget.VBox{#sn=new Ui;constructor(){super(),this.element.classList.add("sidebar-insights"),this.element.appendChild(this.#sn)}setParsedTrace(e,t){this.#sn.parsedTrace=e,this.#sn.traceMetadata=t}setInsights(e){this.#sn.insights=e}setActiveInsight(e){this.#sn.activeInsight=e}}class Ki extends r.Widget.VBox{#sn=new xi;constructor(){super(),this.element.classList.add("sidebar-annotations"),this.element.appendChild(this.#sn)}setAnnotations(e,t){this.#sn.annotationEntryToColorMap=t,this.#sn.annotations=e}deduplicatedAnnotations(){return this.#sn.deduplicatedAnnotations()}}var Gi=Object.freeze({__proto__:null,DEFAULT_SIDEBAR_TAB:"insights",DEFAULT_SIDEBAR_WIDTH_PX:240,RemoveAnnotation:qi,RevealAnnotation:Vi,SidebarWidget:ji}),Yi={cssText:`:host{max-height:100%;overflow:hidden auto;scrollbar-width:thin}.timeline-summary{font-size:var(--sys-typescale-body4-size);flex-direction:column;padding:0 var(--sys-size-6) var(--sys-size-4) var(--sys-size-8)}.summary-range{font-weight:var(--ref-typeface-weight-medium);height:24.5px;line-height:22px}.category-summary{gap:var(--sys-size-4);display:flex;flex-direction:column}.category-row{min-height:16px;line-height:16px}.category-swatch{display:inline-block;width:var(--sys-size-6);height:var(--sys-size-6);margin-right:var(--sys-size-4);top:var(--sys-size-1);position:relative;border:var(--sys-size-1) solid var(--sys-color-neutral-outline)}.category-name{display:inline;word-break:break-all}.category-value{text-align:right;position:relative;float:right;z-index:0;width:var(--sys-size-19)}.background-bar-container{position:absolute;inset:0 0 0 var(--sys-size-3);z-index:-1}.background-bar{width:100%;float:right;height:var(--sys-size-8);background-color:var(--sys-color-surface-yellow);border-bottom:var(--sys-size-1) solid var(--sys-color-yellow-outline)}\n/*# sourceURL=${import.meta.resolve("./timelineSummary.css")} */\n`};const{render:Xi,html:Ji}=s,Zi={total:"Total",rangeSS:"Range:  {PH1} – {PH2}"},Qi=t.i18n.registerUIStrings("panels/timeline/components/TimelineSummary.ts",Zi),en=t.i18n.getLocalizedString.bind(void 0,Qi);class tn extends HTMLElement{#e=r.UIUtils.createShadowRootWithCoreStyles(this,{cssFile:Yi,delegatesFocus:void 0});#on=0;#an=0;#ln=0;#dn=[];set data(e){this.#ln=e.total,this.#dn=e.categories,this.#on=e.rangeStart,this.#an=e.rangeEnd,this.#i()}#i(){const e=Ji`
+    `,n=s.Directives.repeat([i],(()=>this.#ve),(e=>e));s.render(n,this.#e,{host:this})}}customElements.define("devtools-performance-sidebar-insights",Ui);var Bi=Object.freeze({__proto__:null,SidebarInsightsTab:Ui});class qi extends Event{removedAnnotation;static eventName="removeannotation";constructor(e){super(qi.eventName,{bubbles:!0,composed:!0}),this.removedAnnotation=e}}class Vi extends Event{annotation;static eventName="revealannotation";constructor(e){super(Vi.eventName,{bubbles:!0,composed:!0}),this.annotation=e}}class ji extends r.Widget.VBox{#ri=new r.TabbedPane.TabbedPane;#tn=new Wi;#in=new Ki;#nn=a.Settings.Settings.instance().createSetting("timeline-user-has-opened-sidebar-once",!1);userHasOpenedSidebarOnce(){return this.#nn.get()}constructor(){super(),this.setMinimumSize(170,0);const e=!S.Runtime.experiments.isEnabled("react-native-specific-ui");e&&this.#ri.appendTab("insights","Insights",this.#tn,void 0,void 0,!1,!1,0,"timeline.insights-tab"),this.#ri.appendTab("annotations","Annotations",this.#in,void 0,void 0,!1,!1,1,"timeline.annotations-tab"),this.#ri.selectTab(e?"insights":"annotations")}wasShown(){this.#nn.set(!0),this.#ri.show(this.element),this.#rn(),"insights"===this.#ri.selectedTabId&&this.#ri.tabIsDisabled("insights")&&this.#ri.selectTab("annotations")}setAnnotations(e,t){this.#in.setAnnotations(e,t),this.#rn()}#rn(){const e=this.#in.deduplicatedAnnotations();this.#ri.setBadge("annotations",e.length>0?e.length.toString():null)}setParsedTrace(e,t){this.#tn.setParsedTrace(e,t)}setInsights(e){this.#tn.setInsights(e),this.#ri.setTabEnabled("insights",null!==e)}setActiveInsight(e){this.#tn.setActiveInsight(e),e&&this.#ri.selectTab("insights")}}class Wi extends r.Widget.VBox{#sn=new Ui;constructor(){super(),this.element.classList.add("sidebar-insights"),this.element.appendChild(this.#sn)}setParsedTrace(e,t){this.#sn.parsedTrace=e,this.#sn.traceMetadata=t}setInsights(e){this.#sn.insights=e}setActiveInsight(e){this.#sn.activeInsight=e}}class Ki extends r.Widget.VBox{#sn=new xi;constructor(){super(),this.element.classList.add("sidebar-annotations"),this.element.appendChild(this.#sn)}setAnnotations(e,t){this.#sn.annotationEntryToColorMap=t,this.#sn.annotations=e}deduplicatedAnnotations(){return this.#sn.deduplicatedAnnotations()}}var Gi=Object.freeze({__proto__:null,DEFAULT_SIDEBAR_TAB:"insights",DEFAULT_SIDEBAR_WIDTH_PX:240,RemoveAnnotation:qi,RevealAnnotation:Vi,SidebarWidget:ji}),Yi={cssText:`:host{max-height:100%;overflow:hidden auto;scrollbar-width:thin}.timeline-summary{font-size:var(--sys-typescale-body4-size);flex-direction:column;padding:0 var(--sys-size-6) var(--sys-size-4) var(--sys-size-8)}.summary-range{font-weight:var(--ref-typeface-weight-medium);height:24.5px;line-height:22px}.category-summary{gap:var(--sys-size-4);display:flex;flex-direction:column}.category-row{min-height:16px;line-height:16px}.category-swatch{display:inline-block;width:var(--sys-size-6);height:var(--sys-size-6);margin-right:var(--sys-size-4);top:var(--sys-size-1);position:relative;border:var(--sys-size-1) solid var(--sys-color-neutral-outline)}.category-name{display:inline;word-break:break-all}.category-value{text-align:right;position:relative;float:right;z-index:0;width:var(--sys-size-19)}.background-bar-container{position:absolute;inset:0 0 0 var(--sys-size-3);z-index:-1}.background-bar{width:100%;float:right;height:var(--sys-size-8);background-color:var(--sys-color-surface-yellow);border-bottom:var(--sys-size-1) solid var(--sys-color-yellow-outline)}\n/*# sourceURL=${import.meta.resolve("./timelineSummary.css")} */\n`};const{render:Xi,html:Ji}=s,Zi={total:"Total",rangeSS:"Range:  {PH1} – {PH2}"},Qi=t.i18n.registerUIStrings("panels/timeline/components/TimelineSummary.ts",Zi),en=t.i18n.getLocalizedString.bind(void 0,Qi);class tn extends HTMLElement{#e=r.UIUtils.createShadowRootWithCoreStyles(this,{cssFile:Yi,delegatesFocus:void 0});#on=0;#an=0;#ln=0;#dn=[];set data(e){this.#ln=e.total,this.#dn=e.categories,this.#on=e.rangeStart,this.#an=e.rangeEnd,this.#i()}#i(){const e=Ji`
           <div class="timeline-summary">
               <div class="summary-range">${en(Zi.rangeSS,{PH1:t.TimeUtilities.millisToString(this.#on),PH2:t.TimeUtilities.millisToString(this.#an)})}</div>
               <div class="category-summary">

packages/debugger-shell/bin/react-native-devtools

@@ -1,71 +1,71 @@
 #!/usr/bin/env dotslash
 
-// @generated SignedSource<<e93d55b5e28943e44271f5d3738083e0>>
+// @generated SignedSource<<f03dde90e30b4654dc18ba4c688f588e>>
 
 
 {
     "name": "React Native DevTools",
     "platforms": {
         "linux-aarch64": {
-            "size": 116060647,
+            "size": 116056498,
             "hash": "sha256",
-            "digest": "4352f1c9848ca919101ec628bd08b87a72a828d1ab55fa43a02098329fa452fa",
+            "digest": "74ddbe463a81b57533a87f4301c6a6c74323018f70e4f1dbeed0dfbe2ebab257",
             "providers": [
                 {
                     "type": "http",
-                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQM24LW0nPZRk0ypuIG9prz_72YjBJNcVlGSIEpO4zdlLXgw4dFNodH7MKg9eKNTnx7wrVDDBNACrnEPt_OfXOjZyZsV9Oaqu0-vNFRdlEyis4YqmpqGLtz3LvD-9R6fzcWxJI9zrhdPvOvlXP-3Syt1UNITaxXDVqIwAAYpCaAh0oLpupAFCc2yvYw"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQNNgo1RofrfkLfx2qh_zLXdyNL54sIiYfd6p9aXIk-1zJ2lV1dpD2p58FTweCN6y3RZcdE_u9U8z16S_xRbtgA0mobHgSK6JASeR3dCLmMAazKXiiSb98rToqI9XAdOc4pJOGhOb2PVQ_c6lzngiOQ0vkyYU7xFENy-7jKKLbqYFSoDgT7RBs4dnbw"
                 }
             ],
             "format": "tar.gz",
             "path": "React Native DevTools-linux-arm64/React Native DevTools"
         },
         "linux-x86_64": {
-            "size": 115930333,
+            "size": 115924960,
             "hash": "sha256",
-            "digest": "11c7b07942928a6301b07fbf2bc77ce1229b2a52891f23541cdd9858b5250e64",
+            "digest": "eba05066886fe6cd88b4123ed423ad301fd35b2f12381627b3b22c7955c73333",
             "providers": [
                 {
                     "type": "http",
-                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQNDwm7HZRhtNxHqMr1FfSb0afHFGrn1OHxH0gOiggrLrht9QRUgJ3GG5jj7huhQzMRogE-LCMsnxh1ioOZks-YYX4KRt6Kj1-whdWsGFc7lBhPOpk1ssbYFGN1NNyuyFRmH-3nCY3lBC4AmbCUkbDTUeCi9DidCtJeyc73CZJEu7M62rIzxR2yV"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQOXAiG9ivBeW9v9jZMpg7nJZRT1SNBjTz8Nc5_SWUPCUf3xDekbhB6w3lWc8JtfklAzOL5TlJOsvIT3eujx2exadBpcS5NiAnq47KYvcgGP9iVxv5NuRwxttCc3Vncl5CLpGA6-Ifkt1g2-MrdM5yiaSaMKOCDQ83C2Fw07zH6tXt28jsZcTaPj"
                 }
             ],
             "format": "tar.gz",
             "path": "React Native DevTools-linux-x64/React Native DevTools"
         },
         "macos-aarch64": {
-            "size": 110891041,
+            "size": 110890882,
             "hash": "sha256",
-            "digest": "3cbe8b1b3d17e433347f1601435bb9a6cb758528a5c176a66fc52d9977223175",
+            "digest": "f289b7ae3c300b9d744c729a0024e55a2a8d6953a6a8e834d867f705daad1153",
             "providers": [
                 {
                     "type": "http",
-                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQOmC2cqqSv4OrSJKJroYVg_NE8OE4O73AXqY7wXiYqiWQVkDt0Xnyw3ZeUpQT_Qb0-OoT5F8REKoFrB6eqwat8Ovkyina30peYTTwNUzmwnnGQEg7J0fOHNxLF4dkmU1FagXtsoWgex4dKgsK_VpcMsHj3Vp7diomkYvWBVTf_gPVEseYSN9oKq92qa"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQP4xY72fwAGy3-m2Gx7mPodV90K-GbWYYIZ9_xgI89O0rm5GPmXE0u-C18Vq2h6x3zL479nhS7o9_OonWaISxx6TMYZcZsG9nkqTW3-uWcUi6ndzPNQILwryGVg034jrlmjKLB2CiIRoJvdW37wB_1AWFCOKO9gXRozFKV4ndjGDxDC6HJvbfFTacvX"
                 }
             ],
             "format": "tar.gz",
             "path": "React Native DevTools.app/Contents/MacOS/React Native DevTools"
         },
         "macos-x86_64": {
-            "size": 117766158,
+            "size": 117778007,
             "hash": "sha256",
-            "digest": "6fb79bc2ba3008401b4c9c128248657b95b98581ccde60f8fadb622163779775",
+            "digest": "a4698d6c3e2fdfb0c7bafec2130f3701c655468f953af836bf66ce3fe848c6ae",
             "providers": [
                 {
                     "type": "http",
-                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQMMtGn-YGdfLfTVWC8zbQkQx65Asq6iArKt1t__cjZ8UY_s6-sX5XBHr8k1SaexAO21dFZENQVZ1jW_wn_gJ9ENvosQDG1KfWMViKsHli0xRzZ1HVsgPIj_KVXe907QZwwtJf2XhgH0HT8dfH-AQdDcd0_TB5DFUwOsHzhH0nBrHet7YFkbJtPTaA"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQMpGXCifWF6VrFwv_jM4lw-E8eFi59l776z1OYrS8u3mLluAyA8bUtscEyLwoMitqyjF7or5lPuW7OFyiyZ00bKFxSC5lH6Xo_Sc41cQN5n5hmXCX7Wpku9ilU39_ZWmI95W3_oAacYXA1l6ZmHX2AWlv3jERpywrP4J_RNFBi5UAvOhPFo4LtRXw"
                 }
             ],
             "format": "tar.gz",
             "path": "React Native DevTools.app/Contents/MacOS/React Native DevTools"
         },
         "windows-x86_64": {
-            "size": 125527537,
+            "size": 125528869,
             "hash": "sha256",
-            "digest": "579a5b0944c51c3b1b541ad5af66c1ffedf93cae2a891ecdf88cb7219fd9b096",
+            "digest": "95234a13e6ba55556cff46f3da8af9e57ff1010c5483265cbbd444cad01c4216",
             "providers": [
                 {
                     "type": "http",
-                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQOQ3E8lBXqdVHbDPyVb5AOQMrDWjFrFV8fnLLBsygQvLWdpu6ixyG9PgWdwpi5jM-XcDdCHkhBdhaq-5dwT_tgRWKCAMsEBoAIUk0Xg77mGyHG2VF7bNfQ2qFBMuObrsTmrKy1nJ-UFDDm29pJD4GkFQW5NesiBwndJj8t3B8Ur8cczh_XR8rF5"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQOJdgsL68PBrM0rJk-WOm-re-8uqKfI1FfcTcAr1hiFSQr2bKBOqQNtHLnEA6JlRvKrwlOp4XTB6y9pC1TISeGo2dG_BYwN9jsVRLzcGWvfnpZ6GR7evVe82-XKS3Ya5YpScRdLycRqrhHuACXXbQ0HNvhNJjBWZtnQ8N3vOFJXn5QOGlobXqYp"
                 }
             ],
             "format": "tar.gz",

packages/debugger-shell/package.json

@@ -1,5 +1,6 @@
 {
   "name": "@react-native/debugger-shell",
+  "productName": "React Native DevTools",
   "version": "0.82.0-main",
   "description": "Experimental debugger shell for React Native for use with @react-native/debugger-frontend",
   "keywords": [

packages/debugger-shell/src/electron/MainInstanceEntryPoint.js

@@ -8,11 +8,15 @@
  * @format
  */
 
-// $FlowFixMe[unclear-type] We have no Flow types for the Electron API.
-const {BrowserWindow, app, shell, ipcMain} = require('electron') as any;
+import SettingsStore from './SettingsStore.js';
+
 const path = require('path');
 const util = require('util');
 
+// $FlowFixMe[unclear-type] We have no Flow types for the Electron API.
+const {BrowserWindow, Menu, app, shell, ipcMain} = require('electron') as any;
+
+const appSettings = new SettingsStore();
 const windowMetadata = new WeakMap<
   typeof BrowserWindow,
   $ReadOnly<{
@@ -53,10 +57,11 @@ function handleLaunchArgs(argv: string[]) {
       }, 1000);
     }
   } else {
-    // Create the browser window.
     frontendWindow = new BrowserWindow({
-      width: 1200,
-      height: 600,
+      ...(getSavedWindowPosition(windowKey) ?? {
+        width: 1200,
+        height: 600,
+      }),
       webPreferences: {
         partition: 'persist:react-native-devtools',
         preload: require.resolve('./preload.js'),
@@ -66,6 +71,8 @@ function handleLaunchArgs(argv: string[]) {
     });
     // Auto-hide the Windows/Linux menu bar
     frontendWindow.setMenuBarVisibility(false);
+    // Observe and update saved window position
+    setupWindowResizeListeners(frontendWindow, windowKey);
   }
 
   // Open links in the default browser instead of in new Electron windows.
@@ -91,8 +98,68 @@ function handleLaunchArgs(argv: string[]) {
   frontendWindow.focus();
 }
 
+function configureAppMenu() {
+  const template = [
+    ...(process.platform === 'darwin' ? [{role: 'appMenu'}] : []),
+    {role: 'fileMenu'},
+    {role: 'editMenu'},
+    {role: 'viewMenu'},
+    {role: 'windowMenu'},
+    {
+      role: 'help',
+      submenu: [
+        {
+          label: 'React Native Website',
+          click: () => shell.openExternal('https://reactnative.dev'),
+        },
+        {
+          label: 'Release Notes',
+          click: () =>
+            shell.openExternal(
+              'https://github.com/facebook/react-native/releases',
+            ),
+        },
+      ],
+    },
+  ];
+  const menu = Menu.buildFromTemplate(template);
+  Menu.setApplicationMenu(menu);
+}
+
+function getSavedWindowPosition(
+  windowKey: string,
+): ?{width: number, height: number, x?: number, y?: number} {
+  return appSettings.get('windowArrangements', {})[windowKey];
+}
+
+function saveWindowPosition(
+  windowKey: string,
+  position: {x: number, y: number, width: number, height: number},
+) {
+  const windowArrangements = appSettings.get('windowArrangements', {});
+  windowArrangements[windowKey] = position;
+  appSettings.set('windowArrangements', windowArrangements);
+}
+
+function setupWindowResizeListeners(
+  browserWindow: typeof BrowserWindow,
+  windowKey: string,
+) {
+  const savePosition = () => {
+    if (!browserWindow.isDestroyed()) {
+      const [x, y] = browserWindow.getPosition();
+      const [width, height] = browserWindow.getSize();
+      saveWindowPosition(windowKey, {x, y, width, height});
+    }
+  };
+  browserWindow.on('moved', savePosition);
+  browserWindow.on('resized', savePosition);
+  browserWindow.on('closed', savePosition);
+}
+
 app.whenReady().then(() => {
   handleLaunchArgs(process.argv.slice(app.isPackaged ? 1 : 2));
+  configureAppMenu();
 
   app.on(
     'second-instance',

packages/debugger-shell/src/electron/SettingsStore.js

@@ -0,0 +1,128 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ * @oncall react_native
+ */
+
+// $FlowFixMe[unclear-type] We have no Flow types for the Electron API.
+const {app} = require('electron') as any;
+const fs = require('fs');
+const path = require('path');
+
+type Options = $ReadOnly<{
+  name?: string,
+  defaults?: Object,
+}>;
+
+/**
+ * A data persistence layer for storing application settings, modelled after
+ * [`electron-store`](https://www.npmjs.com/package/electron-store).
+ *
+ * Values are saved in a `config.json` file in `app.getPath('userData')`.
+ *
+ * Compatibility:
+ * - Maintains API and file format compatibility with `electron-store@8.2.0`.
+ * - Supports the Electron main process only.
+ */
+export default class SettingsStore {
+  #defaultValues: Object = {};
+  path: string;
+
+  constructor(options: Options = {}) {
+    options = {
+      name: 'config',
+      ...options,
+    };
+    this.#defaultValues = {
+      ...this.#defaultValues,
+      ...options.defaults,
+    };
+    this.path = path.resolve(
+      app.getPath('userData'),
+      `${options.name ?? 'config'}.json`,
+    );
+  }
+
+  get(key: string, defaultValue?: any): any {
+    const store = this.store;
+    return store[key] !== undefined ? store[key] : defaultValue;
+  }
+
+  set(key: string, value: any): void {
+    const {store} = this;
+    if (typeof key === 'object') {
+      const object = key;
+      for (const [k, v] of Object.entries(object)) {
+        store[k] = v;
+      }
+    } else {
+      store[key] = value;
+    }
+    this.store = store;
+  }
+
+  has(key: string): boolean {
+    return key in this.store;
+  }
+
+  reset(...keys: Array<string>): void {
+    for (const key of keys) {
+      if (this.#defaultValues[key] != null) {
+        this.set(key, this.#defaultValues[key]);
+      }
+    }
+  }
+
+  delete(key: string): void {
+    const {store} = this;
+    delete store[key];
+    this.store = store;
+  }
+
+  clear(): void {
+    this.store = {};
+    for (const key of Object.keys(this.#defaultValues)) {
+      this.reset(key);
+    }
+  }
+
+  get store(): {[string]: mixed} {
+    try {
+      const data = fs.readFileSync(this.path, 'utf8');
+      const deserializedData = this._deserialize(data);
+      return {
+        ...((deserializedData: any): {[string]: mixed}),
+      };
+    } catch (error) {
+      if (error?.code === 'ENOENT') {
+        this._ensureDirectory();
+        return {};
+      }
+      throw error;
+    }
+  }
+
+  set store(value: mixed): void {
+    this._ensureDirectory();
+    this._write(value);
+  }
+
+  _deserialize = (value: string): mixed => JSON.parse(value);
+  _serialize = (value: mixed): string =>
+    JSON.stringify(value, undefined, '\t') ?? '';
+
+  _ensureDirectory(): void {
+    fs.mkdirSync(path.dirname(this.path), {recursive: true});
+  }
+
+  _write(value: mixed): void {
+    const data = this._serialize(value);
+
+    fs.writeFileSync(this.path, data, {mode: 0o666});
+  }
+}

packages/debugger-shell/src/electron/index.flow.js

@@ -16,9 +16,8 @@ const util = require('util');
 // $FlowFixMe[unclear-type] We have no Flow types for the Electron API.
 const {app} = require('electron') as any;
 
-// Set the app name and version early - these are used in --version as well as
-// in the User-Agent string.
-app.setName(pkg.name);
+// Set the application name and version
+app.setName(pkg.productName ?? pkg.name);
 app.setVersion(pkg.version + '-' + buildInfo.revision);
 
 // Handle global command line arguments which don't require a window
@@ -26,12 +25,14 @@ app.setVersion(pkg.version + '-' + buildInfo.revision);
 const {
   values: {version = false},
 } = util.parseArgs({
-  options: {version: {type: 'boolean'}},
+  options: {
+    version: {type: 'boolean'},
+  },
   args: process.argv.slice(app.isPackaged ? 1 : 2),
   strict: false,
 });
 if (version) {
-  console.log(`${app.getName()} v${app.getVersion()}`);
+  console.log(`${pkg.name} v${app.getVersion()}`);
   // Not app.quit() - we want to exit immediately without initialising the graphical subsystem.
   app.exit(0);
 }

packages/debugger-shell/src/node/index.flow.js

@@ -30,6 +30,7 @@ async function unstable_spawnDebuggerShellWithArgs(
   {
     mode = 'detached',
     flavor = 'prebuilt',
+    prebuiltBinaryPath,
   }: $ReadOnly<{
     // In 'syncAndExit' mode, the current process will block until the spawned process exits, and then it will exit
     // with the same exit code as the spawned process.
@@ -37,9 +38,13 @@ async function unstable_spawnDebuggerShellWithArgs(
     // continue to run normally.
     mode?: 'syncThenExit' | 'detached',
     flavor?: DebuggerShellFlavor,
+    prebuiltBinaryPath?: string,
   }> = {},
 ): Promise<void> {
-  const [binaryPath, baseArgs] = getShellBinaryAndArgs(flavor);
+  const [binaryPath, baseArgs] = getShellBinaryAndArgs(
+    flavor,
+    prebuiltBinaryPath,
+  );
 
   return new Promise((resolve, reject) => {
     const child = spawn(binaryPath, [...baseArgs, ...args], {
@@ -109,14 +114,13 @@ export type DebuggerShellPreparationResult = $ReadOnly<{
  */
 async function unstable_prepareDebuggerShell(
   flavor: DebuggerShellFlavor,
+  {prebuiltBinaryPath}: {prebuiltBinaryPath?: string} = {},
 ): Promise<DebuggerShellPreparationResult> {
-  const [binaryPath, baseArgs] = getShellBinaryAndArgs(flavor);
-
   try {
     switch (flavor) {
       case 'prebuilt':
         const prebuiltResult = await prepareDebuggerShellFromDotSlashFile(
-          DEVTOOLS_BINARY_DOTSLASH_FILE,
+          prebuiltBinaryPath ?? DEVTOOLS_BINARY_DOTSLASH_FILE,
         );
         if (prebuiltResult.code !== 'success') {
           return prebuiltResult;
@@ -128,6 +132,11 @@ async function unstable_prepareDebuggerShell(
         flavor as empty;
         throw new Error(`Unknown flavor: ${flavor}`);
     }
+
+    const [binaryPath, baseArgs] = getShellBinaryAndArgs(
+      flavor,
+      prebuiltBinaryPath,
+    );
     const {code, stderr} = await spawnAndGetStderr(binaryPath, [
       ...baseArgs,
       '--version',
@@ -149,13 +158,13 @@ async function unstable_prepareDebuggerShell(
 
 function getShellBinaryAndArgs(
   flavor: DebuggerShellFlavor,
+  prebuiltBinaryPath: ?string,
 ): [string, Array<string>] {
   switch (flavor) {
     case 'prebuilt':
       return [
-        // $FlowFixMe[cannot-resolve-module] fb-dotslash includes Flow types but Flow does not pick them up
         require('fb-dotslash'),
-        [DEVTOOLS_BINARY_DOTSLASH_FILE],
+        [prebuiltBinaryPath ?? DEVTOOLS_BINARY_DOTSLASH_FILE],
       ];
     case 'dev':
       return [

packages/debugger-shell/src/node/private/LaunchUtils.js

@@ -44,11 +44,11 @@ async function spawnAndGetStderr(
 async function prepareDebuggerShellFromDotSlashFile(
   filePath: string,
 ): Promise<DebuggerShellPreparationResult> {
-  const {code, stderr} = await spawnAndGetStderr(
-    // $FlowFixMe[cannot-resolve-module] fb-dotslash includes Flow types but Flow does not pick them up
-    require('fb-dotslash'),
-    ['--', 'fetch', filePath],
-  );
+  const {code, stderr} = await spawnAndGetStderr(require('fb-dotslash'), [
+    '--',
+    'fetch',
+    filePath,
+  ]);
   if (code === 0) {
     return {code: 'success'};
   }

packages/dev-middleware/package.json

@@ -33,7 +33,7 @@
     "nullthrows": "^1.1.1",
     "open": "^7.0.3",
     "serve-static": "^1.16.2",
-    "ws": "^6.2.3"
+    "ws": "^7.5.10"
   },
   "engines": {
     "node": ">= 20.19.4"

packages/dev-middleware/src/__tests__/InspectorProxyCdpRewritingHacks-test.js

@@ -21,10 +21,6 @@ import {
   withServerForEachTest,
 } from './ServerUtils';
 import {createHash} from 'crypto';
-import fs from 'fs';
-import path from 'path';
-
-const fsPromise = fs.promises;
 
 // WebSocket is unreliable when using fake timers.
 jest.useRealTimers();
@@ -47,7 +43,6 @@ describe.each(['HTTP', 'HTTPS'])(
 
     const serverRef = withServerForEachTest({
       logger: undefined,
-      projectRoot: __dirname,
       secure: protocol === 'HTTPS',
     });
 
@@ -472,14 +467,7 @@ describe.each(['HTTP', 'HTTPS'])(
         }
       });
 
-      test('reads source from disk', async () => {
-        // Should be just 'foo\n', but the newline can get mangled by the OS
-        // and/or SCM, so let's read the source of truth from disk.
-        const fileRealContents = await fsPromise.readFile(
-          path.join(__dirname, '__fixtures__', 'mock-source-file.txt'),
-          'utf8',
-        );
-
+      test('throws when attempting to pass a filesystem url', async () => {
         const {device, debugger_} = await createAndConnectTarget(
           serverRef,
           autoCleanup.signal,
@@ -490,6 +478,7 @@ describe.each(['HTTP', 'HTTPS'])(
             vm: 'bar-vm',
           },
         );
+
         try {
           await sendFromTargetToDebugger(device, debugger_, 'page1', {
             method: 'Debugger.scriptParsed',
@@ -500,7 +489,7 @@ describe.each(['HTTP', 'HTTPS'])(
               endLine: 0,
               startColumn: 0,
               endColumn: 0,
-              hash: createHash('sha256').update(fileRealContents).digest('hex'),
+              hash: createHash('sha256').update('').digest('hex'),
             },
           });
           const response = await debugger_.sendAndGetResponse({
@@ -511,8 +500,15 @@ describe.each(['HTTP', 'HTTPS'])(
             },
           });
           expect(response.result).toEqual(
-            expect.objectContaining({scriptSource: fileRealContents}),
+            expect.objectContaining({
+              error: {
+                message: expect.stringContaining(
+                  'Can\'t parse requested URL "__fixtures__/mock-source-file.txt"',
+                ),
+              },
+            }),
           );
+
           // The device does not receive the getScriptSource request, since it
           // is handled by the proxy.
           expect(device.wrappedEventParsed).not.toBeCalledWith({

packages/dev-middleware/src/__tests__/InspectorProxyCdpTransport-test.js

@@ -33,7 +33,6 @@ describe.each(['HTTP', 'HTTPS'])(
   protocol => {
     const serverRef = withServerForEachTest({
       logger: undefined,
-      projectRoot: '',
       secure: protocol === 'HTTPS',
     });
     const autoCleanup = withAbortSignalForEachTest();

packages/dev-middleware/src/__tests__/InspectorProxyCustomMessageHandler-test.js

@@ -39,7 +39,6 @@ describe('inspector proxy device message middleware', () => {
     const createCustomMessageHandler = jest.fn().mockImplementation(() => null);
     const {server} = await createServer({
       logger: undefined,
-      projectRoot: '',
       unstable_customInspectorMessageHandler: createCustomMessageHandler,
     });
 
@@ -83,7 +82,6 @@ describe('inspector proxy device message middleware', () => {
     const createCustomMessageHandler = jest.fn().mockImplementation(() => null);
     const {server} = await createServer({
       logger: undefined,
-      projectRoot: '',
       unstable_customInspectorMessageHandler: createCustomMessageHandler,
     });
     const {serverBaseUrl, serverBaseWsUrl} = serverRefUrls(server);
@@ -169,7 +167,6 @@ describe('inspector proxy device message middleware', () => {
 
     const {server} = await createServer({
       logger: undefined,
-      projectRoot: '',
       unstable_customInspectorMessageHandler: createCustomMessageHandler,
     });
 
@@ -231,7 +228,6 @@ describe('inspector proxy device message middleware', () => {
     const handleDeviceMessage = jest.fn();
     const {server} = await createServer({
       logger: undefined,
-      projectRoot: '',
       unstable_customInspectorMessageHandler: () => ({
         handleDeviceMessage,
         handleDebuggerMessage() {},
@@ -264,7 +260,6 @@ describe('inspector proxy device message middleware', () => {
     const handleDeviceMessage = jest.fn();
     const {server} = await createServer({
       logger: undefined,
-      projectRoot: '',
       unstable_customInspectorMessageHandler: () => ({
         handleDeviceMessage,
         handleDebuggerMessage() {},
@@ -304,7 +299,6 @@ describe('inspector proxy device message middleware', () => {
     const handleDebuggerMessage = jest.fn();
     const {server} = await createServer({
       logger: undefined,
-      projectRoot: '',
       unstable_customInspectorMessageHandler: () => ({
         handleDeviceMessage() {},
         handleDebuggerMessage,
@@ -341,7 +335,6 @@ describe('inspector proxy device message middleware', () => {
     const handleDebuggerMessage = jest.fn();
     const {server} = await createServer({
       logger: undefined,
-      projectRoot: '',
       unstable_customInspectorMessageHandler: () => ({
         handleDeviceMessage() {},
         handleDebuggerMessage,

packages/dev-middleware/src/__tests__/InspectorProxyDeviceHandoff-test.js

@@ -37,7 +37,6 @@ const PAGE_DEFAULTS = {
 describe('inspector-proxy device socket handoff', () => {
   const serverRef = withServerForEachTest({
     logger: undefined,
-    projectRoot: '',
   });
   const autoCleanup = withAbortSignalForEachTest();
   afterEach(() => {

packages/dev-middleware/src/__tests__/InspectorProxyHttpApi-test.js

@@ -27,7 +27,6 @@ jest.useFakeTimers();
 describe('inspector proxy HTTP API', () => {
   const serverRef = withServerForEachTest({
     logger: undefined,
-    projectRoot: '',
   });
   const autoCleanup = withAbortSignalForEachTest();
   afterEach(() => {
@@ -261,7 +260,6 @@ describe('inspector proxy HTTP API', () => {
     describe('HTTP vs HTTPS', () => {
       const secureServerRef = withServerForEachTest({
         logger: undefined,
-        projectRoot: '',
         secure: true,
       });
 

packages/dev-middleware/src/__tests__/InspectorProxyReactNativeReloads-test.js

@@ -25,7 +25,6 @@ jest.setTimeout(10000);
 describe('inspector proxy React Native reloads', () => {
   const serverRef = withServerForEachTest({
     logger: undefined,
-    projectRoot: '',
   });
   const autoCleanup = withAbortSignalForEachTest();
   afterEach(() => {

packages/dev-middleware/src/__tests__/StandaloneFuseboxShell-test.js

@@ -34,7 +34,6 @@ describe('enableStandaloneFuseboxShell experiment', () => {
   };
   const serverRef = withServerForEachTest({
     logger: undefined,
-    projectRoot: '',
     unstable_browserLauncher: BrowserLauncherWithFuseboxShell,
     unstable_experiments: {
       enableStandaloneFuseboxShell: true,

packages/dev-middleware/src/__tests__/__fixtures__/mock-source-file.txt

@@ -1 +0,0 @@
-foo

packages/dev-middleware/src/__tests__/embedderScriptStub-test.js

@@ -17,7 +17,6 @@ jest.setTimeout(10000);
 describe('embedder script', () => {
   const serverRef = withServerForEachTest({
     logger: undefined,
-    projectRoot: '',
   });
 
   test('is always served', async () => {

packages/dev-middleware/src/createDevMiddleware.js

@@ -24,8 +24,6 @@ import path from 'path';
 import serveStaticMiddleware from 'serve-static';
 
 type Options = $ReadOnly<{
-  projectRoot: string,
-
   /**
    * The base URL to the dev server, as reachable from the machine on which
    * dev-middleware is hosted. Typically `http://localhost:${metroPort}`.
@@ -78,7 +76,6 @@ type DevMiddlewareAPI = $ReadOnly<{
 }>;
 
 export default function createDevMiddleware({
-  projectRoot,
   serverBaseUrl,
   logger,
   // $FlowFixMe[incompatible-type]
@@ -96,7 +93,6 @@ export default function createDevMiddleware({
   );
 
   const inspectorProxy = new InspectorProxy(
-    projectRoot,
     serverBaseUrl,
     eventReporter,
     experiments,

packages/dev-middleware/src/index.flow.js

@@ -8,8 +8,6 @@
  * @format
  */
 
-export {default as createDevMiddleware} from './createDevMiddleware';
-
 export type {
   BrowserLauncher,
   DebuggerShellPreparationResult,
@@ -20,5 +18,7 @@ export type {
   CustomMessageHandlerConnection,
   CreateCustomMessageHandlerFn,
 } from './inspector-proxy/CustomMessageHandler';
+export type {Logger} from './types/Logger';
 
 export {default as unstable_DefaultBrowserLauncher} from './utils/DefaultBrowserLauncher';
+export {default as createDevMiddleware} from './createDevMiddleware';

packages/dev-middleware/src/inspector-proxy/Device.js

@@ -28,9 +28,7 @@ import type {
 
 import CdpDebugLogging from './CdpDebugLogging';
 import DeviceEventReporter from './DeviceEventReporter';
-import * as fs from 'fs';
 import invariant from 'invariant';
-import * as path from 'path';
 import WS from 'ws';
 
 const debug = require('debug')('Metro:InspectorProxy');
@@ -75,7 +73,6 @@ export type DeviceOptions = $ReadOnly<{
   name: string,
   app: string,
   socket: WS,
-  projectRoot: string,
   eventReporter: ?EventReporter,
   createMessageMiddleware: ?CreateCustomMessageHandlerFn,
   deviceRelativeBaseUrl: URL,
@@ -120,9 +117,6 @@ export default class Device {
   // Mapping built from scriptParsed events and used to fetch file content in `Debugger.getScriptSource`.
   #scriptIdToSourcePathMapping: Map<string, string> = new Map();
 
-  // Root of the project used for relative to absolute source path conversion.
-  #projectRoot: string;
-
   #deviceEventReporter: ?DeviceEventReporter;
 
   #pagesPollingIntervalId: ReturnType<typeof setInterval>;
@@ -151,7 +145,6 @@ export default class Device {
     name,
     app,
     socket,
-    projectRoot,
     eventReporter,
     createMessageMiddleware,
     serverRelativeBaseUrl,
@@ -163,7 +156,6 @@ export default class Device {
     this.#name = name;
     this.#app = app;
     this.#deviceSocket = socket;
-    this.#projectRoot = projectRoot;
     this.#serverRelativeBaseUrl = serverRelativeBaseUrl;
     this.#deviceRelativeBaseUrl = deviceRelativeBaseUrl;
     this.#deviceEventReporter = eventReporter
@@ -880,7 +872,7 @@ export default class Device {
         return this.#processDebuggerSetBreakpointByUrl(req, debuggerInfo);
       case 'Debugger.getScriptSource':
         // Sends response to debugger via side-effect
-        this.#processDebuggerGetScriptSource(req, socket);
+        void this.#processDebuggerGetScriptSource(req, socket);
         return null;
       case 'Network.loadNetworkResource':
         // If we're rewriting URLs (to frontend-relative), we don't want to
@@ -965,10 +957,10 @@ export default class Device {
     return processedReq;
   }
 
-  #processDebuggerGetScriptSource(
+  async #processDebuggerGetScriptSource(
     req: CDPRequest<'Debugger.getScriptSource'>,
     socket: WS,
-  ): void {
+  ): Promise<void> {
     const sendSuccessResponse = (scriptSource: string) => {
       const result: {
         scriptSource: string,
@@ -1005,33 +997,23 @@ export default class Device {
     const pathToSource = this.#scriptIdToSourcePathMapping.get(
       req.params.scriptId,
     );
-    if (pathToSource != null) {
-      const httpURL = this.#tryParseHTTPURL(pathToSource);
-      if (httpURL) {
-        // URL is server-relatve, so we should be able to fetch it from here.
-        this.#fetchText(httpURL).then(
-          text => sendSuccessResponse(text),
-          err =>
-            sendErrorResponse(
-              `Failed to fetch source url ${pathToSource}: ${err.message}`,
-            ),
+
+    try {
+      const httpURL =
+        pathToSource == null ? null : this.#tryParseHTTPURL(pathToSource);
+      if (!httpURL) {
+        throw new Error(
+          `Can't parse requested URL ${pathToSource === undefined ? 'undefined' : JSON.stringify(pathToSource)}`,
         );
-      } else {
-        let file;
-        try {
-          file = fs.readFileSync(
-            path.resolve(this.#projectRoot, pathToSource),
-            'utf8',
-          );
-        } catch (err) {
-          sendErrorResponse(
-            `Failed to fetch source file ${pathToSource}: ${err.message}`,
-          );
-        }
-        if (file != null) {
-          sendSuccessResponse(file);
-        }
       }
+
+      const text = await this.#fetchText(httpURL);
+
+      sendSuccessResponse(text);
+    } catch (err) {
+      sendErrorResponse(
+        `Failed to fetch source url ${pathToSource === undefined ? 'undefined' : JSON.stringify(pathToSource)} for scriptId ${req.params.scriptId}: ${err.message}`,
+      );
     }
   }
 

packages/dev-middleware/src/inspector-proxy/InspectorProxy.js

@@ -75,9 +75,6 @@ export interface InspectorProxyQueries {
  * Main Inspector Proxy class that connects JavaScript VM inside Android/iOS apps and JS debugger.
  */
 export default class InspectorProxy implements InspectorProxyQueries {
-  // Root of the project used for relative to absolute source path conversion.
-  #projectRoot: string;
-
   // The base URL to the dev server from the dev-middleware host.
   #serverBaseUrl: URL;
 
@@ -101,7 +98,6 @@ export default class InspectorProxy implements InspectorProxyQueries {
   #eventLoopPerfTracker: EventLoopPerfTracker;
 
   constructor(
-    projectRoot: string,
     serverBaseUrl: string,
     eventReporter: ?EventReporter,
     experiments: Experiments,
@@ -109,7 +105,6 @@ export default class InspectorProxy implements InspectorProxyQueries {
     customMessageHandler: ?CreateCustomMessageHandlerFn,
     trackEventLoopPerf?: boolean = false,
   ) {
-    this.#projectRoot = projectRoot;
     this.#serverBaseUrl = new URL(serverBaseUrl);
     this.#devices = new Map();
     this.#eventReporter = eventReporter;
@@ -355,7 +350,6 @@ export default class InspectorProxy implements InspectorProxyQueries {
           name: deviceName,
           app: appName,
           socket,
-          projectRoot: this.#projectRoot,
           eventReporter: this.#eventReporter,
           createMessageMiddleware: this.#customMessageHandler,
           deviceRelativeBaseUrl,
@@ -372,12 +366,6 @@ export default class InspectorProxy implements InspectorProxyQueries {
 
         this.#devices.set(deviceId, newDevice);
 
-        this.#logger?.info(
-          "Connection established to app='%s' on device='%s'.",
-          appName,
-          deviceName,
-        );
-
         debug(
           "Got new device connection: name='%s', app=%s, device=%s, via=%s",
           deviceName,
@@ -450,7 +438,7 @@ export default class InspectorProxy implements InspectorProxyQueries {
         );
 
         socket.on('close', (code: number, reason: string) => {
-          this.#logger?.info(
+          debug(
             "Connection closed to device='%s' for app='%s' with code='%s' and reason='%s'.",
             deviceName,
             appName,
@@ -526,7 +514,7 @@ export default class InspectorProxy implements InspectorProxyQueries {
           throw new Error(INTERNAL_ERROR_MESSAGES.UNREGISTERED_DEVICE);
         }
 
-        this.#logger?.info(
+        debug(
           "Connection established to DevTools for app='%s' on device='%s'.",
           device.getApp() || 'unknown',
           device.getName() || 'unknown',
@@ -594,7 +582,7 @@ export default class InspectorProxy implements InspectorProxyQueries {
         });
 
         socket.on('close', (code: number, reason: string) => {
-          this.#logger?.info(
+          debug(
             "Connection closed to DevTools for app='%s' on device='%s' with code='%s' and reason='%s'.",
             device.getApp() || 'unknown',
             device.getName() || 'unknown',

packages/dev-middleware/src/middleware/openDebuggerMiddleware.js

@@ -21,6 +21,7 @@ import type {NextHandleFunction} from 'connect';
 import type {IncomingMessage, ServerResponse} from 'http';
 
 import getDevToolsFrontendUrl from '../utils/getDevToolsFrontendUrl';
+import {createHash} from 'crypto';
 import url from 'url';
 
 const LEGACY_SYNTHETIC_PAGE_TITLE =
@@ -190,11 +191,15 @@ export default function openDebuggerMiddleware({
               }
             }
             if (shouldUseStandaloneFuseboxShell) {
-              const windowKey = [
-                serverBaseUrl,
-                target.webSocketDebuggerUrl,
-                target.appId,
-              ].join('-');
+              const windowKey = createHash('sha256')
+                .update(
+                  [
+                    serverBaseUrl,
+                    target.webSocketDebuggerUrl,
+                    target.appId,
+                  ].join('-'),
+                )
+                .digest('hex');
               if (!browserLauncher.unstable_showFuseboxShell) {
                 throw new Error(
                   'Fusebox shell is not supported by the current browser launcher',

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt

@@ -28,6 +28,7 @@ import com.facebook.react.utils.DependencyUtils.readVersionAndGroupStrings
 import com.facebook.react.utils.JdkConfiguratorUtils.configureJavaToolChains
 import com.facebook.react.utils.JsonUtils
 import com.facebook.react.utils.NdkConfiguratorUtils.configureReactNativeNdk
+import com.facebook.react.utils.ProjectUtils.isHermesV1Enabled
 import com.facebook.react.utils.ProjectUtils.needsCodegenFromPackageJson
 import com.facebook.react.utils.findPackageJsonFile
 import java.io.File
@@ -54,6 +55,10 @@ class ReactPlugin : Plugin<Project> {
                 project,
             )
 
+    if (project.rootProject.isHermesV1Enabled) {
+      rootExtension.hermesV1Enabled.set(true)
+    }
+
     // App Only Configuration
     project.pluginManager.withPlugin("com.android.application") {
       // We wire the root extension with the values coming from the app (either user populated or
@@ -66,10 +71,12 @@ class ReactPlugin : Plugin<Project> {
       project.afterEvaluate {
         val reactNativeDir = extension.reactNativeDir.get().asFile
         val propertiesFile = File(reactNativeDir, "ReactAndroid/gradle.properties")
-        val versionAndGroupStrings = readVersionAndGroupStrings(propertiesFile)
-        val versionString = versionAndGroupStrings.first
-        val groupString = versionAndGroupStrings.second
-        configureDependencies(project, versionString, groupString)
+        val hermesVersionPropertiesFile =
+            File(reactNativeDir, "sdks/hermes-engine/version.properties")
+        val versionAndGroupStrings =
+            readVersionAndGroupStrings(propertiesFile, hermesVersionPropertiesFile)
+        val hermesV1Enabled = rootExtension.hermesV1Enabled.get()
+        configureDependencies(project, versionAndGroupStrings, hermesV1Enabled)
         configureRepositories(project)
       }
 

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactRootProjectPlugin.kt

@@ -67,18 +67,18 @@ class ReactRootProjectPlugin : Plugin<Project> {
     ) {
       project.logger.error(
           """
-      ********************************************************************************
+          ********************************************************************************
 
-      WARNING: Setting `newArchEnabled=false` in your `gradle.properties` file is not
-      supported anymore since React Native 0.82.
-      
-      You can remove the line from your `gradle.properties` file.
-      
-      The application will run with the New Architecture enabled by default.
+          WARNING: Setting `newArchEnabled=false` in your `gradle.properties` file is not
+          supported anymore since React Native 0.82.
 
-      ********************************************************************************
+          You can remove the line from your `gradle.properties` file.
 
-      """
+          The application will run with the New Architecture enabled by default.
+
+          ********************************************************************************
+
+          """
               .trimIndent()
       )
     }

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt

@@ -14,6 +14,7 @@ import com.facebook.react.utils.KotlinStdlibCompatUtils.capitalizeCompat
 import com.facebook.react.utils.NdkConfiguratorUtils.configureJsEnginePackagingOptions
 import com.facebook.react.utils.NdkConfiguratorUtils.configureNewArchPackagingOptions
 import com.facebook.react.utils.ProjectUtils.isHermesEnabled
+import com.facebook.react.utils.ProjectUtils.isHermesV1Enabled
 import com.facebook.react.utils.ProjectUtils.useThirdPartyJSC
 import com.facebook.react.utils.detectedCliFile
 import com.facebook.react.utils.detectedEntryFile
@@ -48,6 +49,7 @@ internal fun Project.configureReactTasks(variant: Variant, config: ReactExtensio
       } else {
         isHermesEnabledInProject
       }
+  val isHermesV1Enabled = project.isHermesV1Enabled || rootProject.isHermesV1Enabled
   val isDebuggableVariant =
       config.debuggableVariants.get().any { it.equals(variant.name, ignoreCase = true) }
   val useThirdPartyJSC = project.useThirdPartyJSC
@@ -65,25 +67,27 @@ internal fun Project.configureReactTasks(variant: Variant, config: ReactExtensio
   if (!isDebuggableVariant) {
     val entryFileEnvVariable = System.getenv("ENTRY_FILE")
     val bundleTask =
-        tasks.register("createBundle${targetName}JsAndAssets", BundleHermesCTask::class.java) {
-          it.root.set(config.root)
-          it.nodeExecutableAndArgs.set(config.nodeExecutableAndArgs)
-          it.cliFile.set(cliFile)
-          it.bundleCommand.set(config.bundleCommand)
-          it.entryFile.set(detectedEntryFile(config, entryFileEnvVariable))
-          it.extraPackagerArgs.set(config.extraPackagerArgs)
-          it.bundleConfig.set(config.bundleConfig)
-          it.bundleAssetName.set(config.bundleAssetName)
-          it.jsBundleDir.set(jsBundleDir)
-          it.resourcesDir.set(resourcesDir)
-          it.hermesEnabled.set(isHermesEnabledInThisVariant)
-          it.minifyEnabled.set(!isHermesEnabledInThisVariant)
-          it.devEnabled.set(false)
-          it.jsIntermediateSourceMapsDir.set(jsIntermediateSourceMapsDir)
-          it.jsSourceMapsDir.set(jsSourceMapsDir)
-          it.hermesCommand.set(config.hermesCommand)
-          it.hermesFlags.set(config.hermesFlags)
-          it.reactNativeDir.set(config.reactNativeDir)
+        tasks.register("createBundle${targetName}JsAndAssets", BundleHermesCTask::class.java) { task
+          ->
+          task.root.set(config.root)
+          task.nodeExecutableAndArgs.set(config.nodeExecutableAndArgs)
+          task.cliFile.set(cliFile)
+          task.bundleCommand.set(config.bundleCommand)
+          task.entryFile.set(detectedEntryFile(config, entryFileEnvVariable))
+          task.extraPackagerArgs.set(config.extraPackagerArgs)
+          task.bundleConfig.set(config.bundleConfig)
+          task.bundleAssetName.set(config.bundleAssetName)
+          task.jsBundleDir.set(jsBundleDir)
+          task.resourcesDir.set(resourcesDir)
+          task.hermesEnabled.set(isHermesEnabledInThisVariant)
+          task.hermesV1Enabled.set(isHermesV1Enabled)
+          task.minifyEnabled.set(!isHermesEnabledInThisVariant)
+          task.devEnabled.set(false)
+          task.jsIntermediateSourceMapsDir.set(jsIntermediateSourceMapsDir)
+          task.jsSourceMapsDir.set(jsSourceMapsDir)
+          task.hermesCommand.set(config.hermesCommand)
+          task.hermesFlags.set(config.hermesFlags)
+          task.reactNativeDir.set(config.reactNativeDir)
         }
     variant.sources.res?.addGeneratedSourceDirectory(bundleTask, BundleHermesCTask::resourcesDir)
     variant.sources.assets?.addGeneratedSourceDirectory(bundleTask, BundleHermesCTask::jsBundleDir)

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/internal/PrivateReactExtension.kt

@@ -11,6 +11,7 @@ import javax.inject.Inject
 import org.gradle.api.Project
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.Property
 
 /**
  * A private extension we set on the rootProject to make easier to share values at execution time
@@ -57,4 +58,6 @@ abstract class PrivateReactExtension @Inject constructor(project: Project) {
 
   val codegenDir: DirectoryProperty =
       objects.directoryProperty().convention(root.dir("node_modules/@react-native/codegen"))
+
+  val hermesV1Enabled: Property<Boolean> = objects.property(Boolean::class.java).convention(false)
 }

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt

@@ -63,6 +63,8 @@ abstract class BundleHermesCTask : DefaultTask() {
 
   @get:Input abstract val hermesEnabled: Property<Boolean>
 
+  @get:Input abstract val hermesV1Enabled: Property<Boolean>
+
   @get:Input abstract val devEnabled: Property<Boolean>
 
   @get:Input abstract val extraPackagerArgs: ListProperty<String>
@@ -94,7 +96,8 @@ abstract class BundleHermesCTask : DefaultTask() {
     runCommand(bundleCommand)
 
     if (hermesEnabled.get()) {
-      val detectedHermesCommand = detectOSAwareHermesCommand(root.get().asFile, hermesCommand.get())
+      val detectedHermesCommand =
+          detectOSAwareHermesCommand(root.get().asFile, hermesCommand.get(), hermesV1Enabled.get())
       val bytecodeFile = File("${bundleFile}.hbc")
       val outputSourceMap = resolveOutputSourceMap(bundleAssetFilename)
       val compilerSourceMap = resolveCompilerSourceMap(bundleAssetFilename)

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateAutolinkingNewArchitecturesFileTask.kt

@@ -168,13 +168,13 @@ abstract class GenerateAutolinkingNewArchitecturesFileTask : DefaultTask() {
         # This code was generated by [React Native](https://www.npmjs.com/package/@react-native/gradle-plugin)
         cmake_minimum_required(VERSION 3.13)
         set(CMAKE_VERBOSE_MAKEFILE on)
-        
+
         # We set REACTNATIVE_MERGED_SO so libraries/apps can selectively decide to depend on either libreactnative.so
         # or link against a old prefab target (this is needed for React Native 0.76 on).
         set(REACTNATIVE_MERGED_SO true)
-        
+
         {{ libraryIncludes }}
-        
+
         set(AUTOLINKED_LIBRARIES
           {{ libraryModules }}
         )
@@ -191,28 +191,28 @@ abstract class GenerateAutolinkingNewArchitecturesFileTask : DefaultTask() {
          * once the code is regenerated.
          *
          */
-        
+
         #include "autolinking.h"
         {{ autolinkingCppIncludes }}
-        
+
         namespace facebook {
         namespace react {
-        
+
         std::shared_ptr<TurboModule> autolinking_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
         {{ autolinkingCppTurboModuleJavaProviders }}
           return nullptr;
         }
-        
+
         std::shared_ptr<TurboModule> autolinking_cxxModuleProvider(const std::string moduleName, const std::shared_ptr<CallInvoker>& jsInvoker) {
         {{ autolinkingCppTurboModuleCxxProviders }}
           return nullptr;
         }
-        
+
         void autolinking_registerProviders(std::shared_ptr<ComponentDescriptorProviderRegistry const> providerRegistry) {
         {{ autolinkingCppComponentDescriptors }}
           return;
         }
-        
+
         } // namespace react
         } // namespace facebook
         """
@@ -228,22 +228,22 @@ abstract class GenerateAutolinkingNewArchitecturesFileTask : DefaultTask() {
          * once the code is regenerated.
          *
          */
-        
+
         #pragma once
-        
+
         #include <ReactCommon/CallInvoker.h>
         #include <ReactCommon/JavaTurboModule.h>
         #include <ReactCommon/TurboModule.h>
         #include <jsi/jsi.h>
         #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-        
+
         namespace facebook {
         namespace react {
-        
+
         std::shared_ptr<TurboModule> autolinking_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params);
         std::shared_ptr<TurboModule> autolinking_cxxModuleProvider(const std::string moduleName, const std::shared_ptr<CallInvoker>& jsInvoker);
         void autolinking_registerProviders(std::shared_ptr<ComponentDescriptorProviderRegistry const> providerRegistry);
-        
+
         } // namespace react
         } // namespace facebook
         """

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateEntryPointTask.kt

@@ -65,19 +65,19 @@ abstract class GenerateEntryPointTask : DefaultTask() {
     val generatedFileContentsTemplate =
         """
         package com.facebook.react;
-        
+
         import android.app.Application;
         import android.content.Context;
         import android.content.res.Resources;
-        
+
         import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
         import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger;
         import com.facebook.react.views.view.WindowUtilKt;
         import com.facebook.react.soloader.OpenSourceMergedSoMapping;
         import com.facebook.soloader.SoLoader;
-        
+
         import java.io.IOException;
-        
+
         /**
           * This class is the entry point for loading React Native using the configuration
           * that the users specifies in their .gradle files.
@@ -102,7 +102,7 @@ abstract class GenerateEntryPointTask : DefaultTask() {
             }
           }
         }
-              """
+        """
             .trimIndent()
   }
 }

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GeneratePackageListTask.kt

@@ -137,61 +137,61 @@ abstract class GeneratePackageListTask : DefaultTask() {
     val generatedFileContentsTemplate =
         """
         package com.facebook.react;
-        
+
         import android.app.Application;
         import android.content.Context;
         import android.content.res.Resources;
-        
+
         import com.facebook.react.ReactPackage;
         import com.facebook.react.shell.MainPackageConfig;
         import com.facebook.react.shell.MainReactPackage;
         import java.util.Arrays;
         import java.util.ArrayList;
-        
+
         {{ packageImports }}
-        
+
         @SuppressWarnings("deprecation")
         public class PackageList {
           private Application application;
           private ReactNativeHost reactNativeHost;
           private MainPackageConfig mConfig;
-        
+
           public PackageList(ReactNativeHost reactNativeHost) {
             this(reactNativeHost, null);
           }
-        
+
           public PackageList(Application application) {
             this(application, null);
           }
-        
+
           public PackageList(ReactNativeHost reactNativeHost, MainPackageConfig config) {
             this.reactNativeHost = reactNativeHost;
             mConfig = config;
           }
-        
+
           public PackageList(Application application, MainPackageConfig config) {
             this.reactNativeHost = null;
             this.application = application;
             mConfig = config;
           }
-        
+
           private ReactNativeHost getReactNativeHost() {
             return this.reactNativeHost;
           }
-        
+
           private Resources getResources() {
             return this.getApplication().getResources();
           }
-        
+
           private Application getApplication() {
             if (this.reactNativeHost == null) return this.application;
             return this.reactNativeHost.getApplication();
           }
-        
+
           private Context getApplicationContext() {
             return this.getApplication().getApplicationContext();
           }
-        
+
           public ArrayList<ReactPackage> getPackages() {
             return new ArrayList<>(Arrays.<ReactPackage>asList(
               new MainReactPackage(mConfig){{ packageClassInstances }}

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/BackwardCompatUtils.kt

@@ -21,24 +21,24 @@ internal object BackwardCompatUtils {
       if (reactMap.isNotEmpty()) {
         project.logger.error(
             """
-          ********************************************************************************
- 
-          ERROR: Using old project.ext.react configuration.
-          We identified that your project is using a old configuration block as:
-          
-          project.ext.react = [
-              // ...
-          ]
-          
-          You should migrate to the new configuration:
-          
-          react {
-              // ...
-          }
-          You can find documentation inside `android/app/build.gradle` on how to use it.
-        
-          ********************************************************************************
-          """
+            ********************************************************************************
+
+            ERROR: Using old project.ext.react configuration.
+            We identified that your project is using a old configuration block as:
+
+            project.ext.react = [
+                // ...
+            ]
+
+            You should migrate to the new configuration:
+
+            react {
+                // ...
+            }
+            You can find documentation inside `android/app/build.gradle` on how to use it.
+
+            ********************************************************************************
+            """
                 .trimIndent()
         )
       }

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/DependencyUtils.kt

@@ -7,12 +7,15 @@
 
 package com.facebook.react.utils
 
-import com.facebook.react.utils.PropertyUtils.DEFAULT_INTERNAL_PUBLISHING_GROUP
+import com.facebook.react.utils.PropertyUtils.DEFAULT_INTERNAL_HERMES_PUBLISHING_GROUP
+import com.facebook.react.utils.PropertyUtils.DEFAULT_INTERNAL_REACT_PUBLISHING_GROUP
 import com.facebook.react.utils.PropertyUtils.EXCLUSIVE_ENTEPRISE_REPOSITORY
 import com.facebook.react.utils.PropertyUtils.INCLUDE_JITPACK_REPOSITORY
 import com.facebook.react.utils.PropertyUtils.INCLUDE_JITPACK_REPOSITORY_DEFAULT
-import com.facebook.react.utils.PropertyUtils.INTERNAL_PUBLISHING_GROUP
+import com.facebook.react.utils.PropertyUtils.INTERNAL_HERMES_PUBLISHING_GROUP
+import com.facebook.react.utils.PropertyUtils.INTERNAL_HERMES_V1_VERSION_NAME
 import com.facebook.react.utils.PropertyUtils.INTERNAL_REACT_NATIVE_MAVEN_LOCAL_REPO
+import com.facebook.react.utils.PropertyUtils.INTERNAL_REACT_PUBLISHING_GROUP
 import com.facebook.react.utils.PropertyUtils.INTERNAL_USE_HERMES_NIGHTLY
 import com.facebook.react.utils.PropertyUtils.INTERNAL_VERSION_NAME
 import com.facebook.react.utils.PropertyUtils.SCOPED_EXCLUSIVE_ENTEPRISE_REPOSITORY
@@ -25,6 +28,14 @@ import org.gradle.api.artifacts.repositories.MavenArtifactRepository
 
 internal object DependencyUtils {
 
+  internal data class Coordinates(
+      val versionString: String,
+      val hermesVersionString: String,
+      val hermesV1VersionString: String,
+      val reactGroupString: String = DEFAULT_INTERNAL_REACT_PUBLISHING_GROUP,
+      val hermesGroupString: String = DEFAULT_INTERNAL_HERMES_PUBLISHING_GROUP,
+  )
+
   /**
    * This method takes care of configuring the repositories{} block for both the app and all the 3rd
    * party libraries which are auto-linked.
@@ -95,14 +106,20 @@ internal object DependencyUtils {
    * This method takes care of configuring the resolution strategy for both the app and all the 3rd
    * party libraries which are auto-linked. Specifically it takes care of:
    * - Forcing the react-android/hermes-android version to the one specified in the package.json
-   * - Substituting `react-native` with `react-android` and `hermes-engine` with `hermes-android`.
+   * - Substituting `react-native` with `react-android` and `hermes-engine` with `hermes-android`
+   * - Selecting between the classic Hermes and Hermes V1
    */
   fun configureDependencies(
       project: Project,
-      versionString: String,
-      groupString: String = DEFAULT_INTERNAL_PUBLISHING_GROUP,
+      coordinates: Coordinates,
+      hermesV1Enabled: Boolean = false,
   ) {
-    if (versionString.isBlank()) return
+    if (
+        coordinates.versionString.isBlank() ||
+            (!hermesV1Enabled && coordinates.hermesVersionString.isBlank()) ||
+            (hermesV1Enabled && coordinates.hermesV1VersionString.isBlank())
+    )
+        return
     project.rootProject.allprojects { eachProject ->
       eachProject.configurations.all { configuration ->
         // Here we set a dependencySubstitution for both react-native and hermes-engine as those
@@ -110,61 +127,83 @@ internal object DependencyUtils {
         // This allows users to import libraries that are still using
         // implementation("com.facebook.react:react-native:+") and resolve the right dependency.
         configuration.resolutionStrategy.dependencySubstitution {
-          getDependencySubstitutions(versionString, groupString).forEach { (module, dest, reason) ->
+          getDependencySubstitutions(coordinates, hermesV1Enabled).forEach { (module, dest, reason)
+            ->
             it.substitute(it.module(module)).using(it.module(dest)).because(reason)
           }
         }
         configuration.resolutionStrategy.force(
-            "${groupString}:react-android:${versionString}",
+            "${coordinates.reactGroupString}:react-android:${coordinates.versionString}",
         )
         if (!(eachProject.findProperty(INTERNAL_USE_HERMES_NIGHTLY) as? String).toBoolean()) {
           // Contributors only: The hermes-engine version is forced only if the user has
           // not opted into using nightlies for local development.
-          configuration.resolutionStrategy.force("${groupString}:hermes-android:${versionString}")
+          configuration.resolutionStrategy.force(
+              // TODO: T237406039 update coordinates
+              if (hermesV1Enabled)
+                  "${coordinates.hermesGroupString}:hermes-android:${coordinates.hermesV1VersionString}"
+              else
+                  "${coordinates.reactGroupString}:hermes-android:${coordinates.hermesVersionString}"
+          )
         }
       }
     }
   }
 
   internal fun getDependencySubstitutions(
-      versionString: String,
-      groupString: String = DEFAULT_INTERNAL_PUBLISHING_GROUP,
+      coordinates: Coordinates,
+      hermesV1Enabled: Boolean = false,
   ): List<Triple<String, String, String>> {
+    // TODO: T231755027 update coordinates and versioning
     val dependencySubstitution = mutableListOf<Triple<String, String, String>>()
+    // TODO: T237406039 update coordinates
+    val hermesVersionString =
+        if (hermesV1Enabled)
+            "${coordinates.hermesGroupString}:hermes-android:${coordinates.hermesV1VersionString}"
+        else "${coordinates.reactGroupString}:hermes-android:${coordinates.hermesVersionString}"
     dependencySubstitution.add(
         Triple(
             "com.facebook.react:react-native",
-            "${groupString}:react-android:${versionString}",
+            "${coordinates.reactGroupString}:react-android:${coordinates.versionString}",
             "The react-native artifact was deprecated in favor of react-android due to https://github.com/facebook/react-native/issues/35210.",
         )
     )
     dependencySubstitution.add(
         Triple(
             "com.facebook.react:hermes-engine",
-            "${groupString}:hermes-android:${versionString}",
+            hermesVersionString,
             "The hermes-engine artifact was deprecated in favor of hermes-android due to https://github.com/facebook/react-native/issues/35210.",
         )
     )
-    if (groupString != DEFAULT_INTERNAL_PUBLISHING_GROUP) {
+    if (coordinates.reactGroupString != DEFAULT_INTERNAL_REACT_PUBLISHING_GROUP) {
       dependencySubstitution.add(
           Triple(
               "com.facebook.react:react-android",
-              "${groupString}:react-android:${versionString}",
+              "${coordinates.reactGroupString}:react-android:${coordinates.versionString}",
               "The react-android dependency was modified to use the correct Maven group.",
           )
       )
+      // TODO: T237406039 update coordinates
       dependencySubstitution.add(
           Triple(
               "com.facebook.react:hermes-android",
-              "${groupString}:hermes-android:${versionString}",
+              hermesVersionString,
               "The hermes-android dependency was modified to use the correct Maven group.",
           )
       )
+    } else if (hermesV1Enabled) {
+      dependencySubstitution.add(
+          Triple(
+              "com.facebook.react:hermes-android",
+              hermesVersionString,
+              "The hermes-android dependency was modified to use Hermes V1.",
+          )
+      )
     }
     return dependencySubstitution
   }
 
-  fun readVersionAndGroupStrings(propertiesFile: File): Pair<String, String> {
+  fun readVersionAndGroupStrings(propertiesFile: File, hermesVersionFile: File): Coordinates {
     val reactAndroidProperties = Properties()
     propertiesFile.inputStream().use { reactAndroidProperties.load(it) }
     val versionStringFromFile = (reactAndroidProperties[INTERNAL_VERSION_NAME] as? String).orEmpty()
@@ -176,10 +215,27 @@ internal object DependencyUtils {
           versionStringFromFile
         }
     // Returns Maven group for repos using different group for Maven artifacts
-    val groupString =
-        reactAndroidProperties[INTERNAL_PUBLISHING_GROUP] as? String
-            ?: DEFAULT_INTERNAL_PUBLISHING_GROUP
-    return Pair(versionString, groupString)
+    val reactGroupString =
+        reactAndroidProperties[INTERNAL_REACT_PUBLISHING_GROUP] as? String
+            ?: DEFAULT_INTERNAL_REACT_PUBLISHING_GROUP
+    val hermesGroupString =
+        reactAndroidProperties[INTERNAL_HERMES_PUBLISHING_GROUP] as? String
+            ?: DEFAULT_INTERNAL_HERMES_PUBLISHING_GROUP
+    // TODO: T237406039 read both versions from the same file
+    val hermesVersionProperties = Properties()
+    hermesVersionFile.inputStream().use { hermesVersionProperties.load(it) }
+
+    val hermesVersion = versionString
+    val hermesV1Version =
+        (hermesVersionProperties[INTERNAL_HERMES_V1_VERSION_NAME] as? String).orEmpty()
+
+    return Coordinates(
+        versionString,
+        hermesVersion,
+        hermesV1Version,
+        reactGroupString,
+        hermesGroupString,
+    )
   }
 
   fun Project.mavenRepoFromUrl(

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt

@@ -105,11 +105,11 @@ private fun detectCliFile(reactNativeRoot: File, preconfiguredCliFile: File?): F
 
   error(
       """
-        Couldn't determine CLI location!
+      Couldn't determine CLI location!
 
-        Please set `react { cliFile = file(...) }` inside your
-        build.gradle to the path of the react-native cli.js file.
-        This file typically resides in `node_modules/react-native/cli.js`
+      Please set `react { cliFile = file(...) }` inside your
+      build.gradle to the path of the react-native cli.js file.
+      This file typically resides in `node_modules/react-native/cli.js`
       """
           .trimIndent()
   )
@@ -122,11 +122,16 @@ private fun detectCliFile(reactNativeRoot: File, preconfiguredCliFile: File?): F
  *    used if the user is building Hermes from source.
  * 3. The file located in `node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc` where `%OS-BIN%`
  *    is substituted with the correct OS arch. This will be used if the user is using a precompiled
- *    hermes-engine package.
+ *    hermes-engine package. Or, if the user has opted in to use Hermes V1, the used file will be
+ *    located in `node_modules/hermes-compiler/%OS-BIN%/hermesc` where `%OS-BIN%` is substituted
+ *    with the correct OS arch.
  * 4. Fails otherwise
  */
-internal fun detectOSAwareHermesCommand(projectRoot: File, hermesCommand: String): String {
-  // 1. If the project specifies a Hermes command, don't second guess it.
+internal fun detectOSAwareHermesCommand(
+    projectRoot: File,
+    hermesCommand: String,
+    hermesV1Enabled: Boolean = false,
+): String { // 1. If the project specifies a Hermes command, don't second guess it.
   if (hermesCommand.isNotBlank()) {
     val osSpecificHermesCommand =
         if ("%OS-BIN%" in hermesCommand) {
@@ -146,9 +151,13 @@ internal fun detectOSAwareHermesCommand(projectRoot: File, hermesCommand: String
     return builtHermesc.cliPath(projectRoot)
   }
 
-  // 3. If the react-native contains a pre-built hermesc, use it.
+  // 3. If Hermes V1 is enabled, use hermes-compiler from npm, otherwise, if the
+  // react-native contains a pre-built hermesc, use it.
+  // TODO: T237406039 use hermes-compiler from npm for both
+  val hermesCPath = if (hermesV1Enabled) HERMES_COMPILER_NPM_DIR else HERMESC_IN_REACT_NATIVE_DIR
   val prebuiltHermesPath =
-      HERMESC_IN_REACT_NATIVE_DIR.plus(getHermesCBin())
+      hermesCPath
+          .plus(getHermesCBin())
           .replace("%OS-BIN%", getHermesOSBin())
           // Execution on Windows fails with / as separator
           .replace('/', File.separatorChar)
@@ -233,6 +242,7 @@ internal fun readPackageJsonFile(
   return packageJson?.let { JsonUtils.fromPackageJson(it) }
 }
 
+private const val HERMES_COMPILER_NPM_DIR = "node_modules/hermes-compiler/hermesc/%OS-BIN%/"
 private const val HERMESC_IN_REACT_NATIVE_DIR = "node_modules/react-native/sdks/hermesc/%OS-BIN%/"
 private const val HERMESC_BUILT_FROM_SOURCE_DIR =
     "node_modules/react-native/ReactAndroid/hermes-engine/build/hermes/bin/"

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/ProjectUtils.kt

@@ -13,14 +13,17 @@ import com.facebook.react.utils.KotlinStdlibCompatUtils.lowercaseCompat
 import com.facebook.react.utils.KotlinStdlibCompatUtils.toBooleanStrictOrNullCompat
 import com.facebook.react.utils.PropertyUtils.EDGE_TO_EDGE_ENABLED
 import com.facebook.react.utils.PropertyUtils.HERMES_ENABLED
+import com.facebook.react.utils.PropertyUtils.HERMES_V1_ENABLED
 import com.facebook.react.utils.PropertyUtils.REACT_NATIVE_ARCHITECTURES
 import com.facebook.react.utils.PropertyUtils.SCOPED_EDGE_TO_EDGE_ENABLED
 import com.facebook.react.utils.PropertyUtils.SCOPED_HERMES_ENABLED
+import com.facebook.react.utils.PropertyUtils.SCOPED_HERMES_V1_ENABLED
 import com.facebook.react.utils.PropertyUtils.SCOPED_REACT_NATIVE_ARCHITECTURES
 import com.facebook.react.utils.PropertyUtils.SCOPED_USE_THIRD_PARTY_JSC
 import com.facebook.react.utils.PropertyUtils.USE_THIRD_PARTY_JSC
 import org.gradle.api.Project
 import org.gradle.api.file.DirectoryProperty
+import org.jetbrains.kotlin.gradle.plugin.extraProperties
 
 internal object ProjectUtils {
 
@@ -68,6 +71,17 @@ internal object ProjectUtils {
             (project.hasProperty(SCOPED_USE_THIRD_PARTY_JSC) &&
                 project.property(SCOPED_USE_THIRD_PARTY_JSC).toString().toBoolean())
 
+  internal val Project.isHermesV1Enabled: Boolean
+    get() =
+        (project.hasProperty(HERMES_V1_ENABLED) &&
+            project.property(HERMES_V1_ENABLED).toString().toBoolean()) ||
+            (project.hasProperty(SCOPED_HERMES_V1_ENABLED) &&
+                project.property(SCOPED_HERMES_V1_ENABLED).toString().toBoolean()) ||
+            (project.extraProperties.has(HERMES_V1_ENABLED) &&
+                project.extraProperties.get(HERMES_V1_ENABLED).toString().toBoolean()) ||
+            (project.extraProperties.has(SCOPED_HERMES_V1_ENABLED) &&
+                project.extraProperties.get(SCOPED_HERMES_V1_ENABLED).toString().toBoolean())
+
   internal fun Project.needsCodegenFromPackageJson(rootProperty: DirectoryProperty): Boolean {
     val parsedPackageJson = readPackageJsonFile(this, rootProperty)
     return needsCodegenFromPackageJson(parsedPackageJson)

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PropertyUtils.kt

@@ -18,6 +18,10 @@ object PropertyUtils {
   const val HERMES_ENABLED = "hermesEnabled"
   const val SCOPED_HERMES_ENABLED = "react.hermesEnabled"
 
+  /** Public property that toggles Hermes V1 */
+  const val HERMES_V1_ENABLED = "hermesV1Enabled"
+  const val SCOPED_HERMES_V1_ENABLED = "react.hermesV1Enabled"
+
   /** Public property that toggles edge-to-edge */
   const val EDGE_TO_EDGE_ENABLED = "edgeToEdgeEnabled"
   const val SCOPED_EDGE_TO_EDGE_ENABLED = "react.edgeToEdgeEnabled"
@@ -68,9 +72,17 @@ object PropertyUtils {
   const val INTERNAL_USE_HERMES_NIGHTLY = "react.internal.useHermesNightly"
 
   /** Internal property used to override the publishing group for the React Native artifacts. */
-  const val INTERNAL_PUBLISHING_GROUP = "react.internal.publishingGroup"
-  const val DEFAULT_INTERNAL_PUBLISHING_GROUP = "com.facebook.react"
+  const val INTERNAL_REACT_PUBLISHING_GROUP = "react.internal.publishingGroup"
+  const val INTERNAL_HERMES_PUBLISHING_GROUP = "react.internal.hermesPublishingGroup"
+  const val DEFAULT_INTERNAL_REACT_PUBLISHING_GROUP = "com.facebook.react"
+  const val DEFAULT_INTERNAL_HERMES_PUBLISHING_GROUP = "com.facebook.hermes"
 
   /** Internal property used to control the version name of React Native */
   const val INTERNAL_VERSION_NAME = "VERSION_NAME"
+
+  /**
+   * Internal property, shared with iOS, used to control the version name of Hermes Engine. This is
+   * stored in sdks/hermes-engine/version.properties
+   */
+  const val INTERNAL_HERMES_V1_VERSION_NAME = "HERMES_V1_VERSION_NAME"
 }

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateAutolinkingNewArchitecturesFileTaskTest.kt

@@ -34,9 +34,9 @@ class GenerateAutolinkingNewArchitecturesFileTaskTest {
     val inputFile = tempFolder.newFile("config.json")
 
     val task =
-        createTestTask<GenerateAutolinkingNewArchitecturesFileTask> {
-          it.generatedOutputDirectory.set(outputFolder)
-          it.autolinkInputFile.set(inputFile)
+        createTestTask<GenerateAutolinkingNewArchitecturesFileTask> { task ->
+          task.generatedOutputDirectory.set(outputFolder)
+          task.autolinkInputFile.set(inputFile)
         }
 
     assertThat(task.generatedOutputDirectory.get().asFile).isEqualTo(outputFolder)
@@ -120,20 +120,20 @@ class GenerateAutolinkingNewArchitecturesFileTaskTest {
     assertThat(output)
         .isEqualTo(
             """
-      # This code was generated by [React Native](https://www.npmjs.com/package/@react-native/gradle-plugin)
-      cmake_minimum_required(VERSION 3.13)
-      set(CMAKE_VERBOSE_MAKEFILE on)
-      
-      # We set REACTNATIVE_MERGED_SO so libraries/apps can selectively decide to depend on either libreactnative.so
-      # or link against a old prefab target (this is needed for React Native 0.76 on).
-      set(REACTNATIVE_MERGED_SO true)
-      
-      
-      
-      set(AUTOLINKED_LIBRARIES
-        
-      )
-    """
+            # This code was generated by [React Native](https://www.npmjs.com/package/@react-native/gradle-plugin)
+            cmake_minimum_required(VERSION 3.13)
+            set(CMAKE_VERBOSE_MAKEFILE on)
+
+            # We set REACTNATIVE_MERGED_SO so libraries/apps can selectively decide to depend on either libreactnative.so
+            # or link against a old prefab target (this is needed for React Native 0.76 on).
+            set(REACTNATIVE_MERGED_SO true)
+
+
+
+            set(AUTOLINKED_LIBRARIES
+              
+            )
+            """
                 .trimIndent()
         )
   }
@@ -147,24 +147,24 @@ class GenerateAutolinkingNewArchitecturesFileTaskTest {
     assertThat(output)
         .isEqualTo(
             """
-      # This code was generated by [React Native](https://www.npmjs.com/package/@react-native/gradle-plugin)
-      cmake_minimum_required(VERSION 3.13)
-      set(CMAKE_VERBOSE_MAKEFILE on)
-      
-      # We set REACTNATIVE_MERGED_SO so libraries/apps can selectively decide to depend on either libreactnative.so
-      # or link against a old prefab target (this is needed for React Native 0.76 on).
-      set(REACTNATIVE_MERGED_SO true)
-      
-      add_subdirectory("./a/directory/" aPackage_autolinked_build)
-      add_subdirectory("./another/directory/with\ spaces/" anotherPackage_autolinked_build)
-      add_subdirectory("./another/directory/cxx/" anotherPackage_cxxmodule_autolinked_build)
-      
-      set(AUTOLINKED_LIBRARIES
-        react_codegen_aPackage
-        react_codegen_anotherPackage
-      another_cxxModule
-      )
-    """
+            # This code was generated by [React Native](https://www.npmjs.com/package/@react-native/gradle-plugin)
+            cmake_minimum_required(VERSION 3.13)
+            set(CMAKE_VERBOSE_MAKEFILE on)
+
+            # We set REACTNATIVE_MERGED_SO so libraries/apps can selectively decide to depend on either libreactnative.so
+            # or link against a old prefab target (this is needed for React Native 0.76 on).
+            set(REACTNATIVE_MERGED_SO true)
+
+            add_subdirectory("./a/directory/" aPackage_autolinked_build)
+            add_subdirectory("./another/directory/with\ spaces/" anotherPackage_autolinked_build)
+            add_subdirectory("./another/directory/cxx/" anotherPackage_cxxmodule_autolinked_build)
+
+            set(AUTOLINKED_LIBRARIES
+              react_codegen_aPackage
+              react_codegen_anotherPackage
+            another_cxxModule
+            )
+            """
                 .trimIndent()
         )
   }
@@ -178,38 +178,38 @@ class GenerateAutolinkingNewArchitecturesFileTaskTest {
     assertThat(output)
         .isEqualTo(
             """
-      /**
-       * This code was generated by [React Native](https://www.npmjs.com/package/@react-native/gradle-plugin).
-       *
-       * Do not edit this file as changes may cause incorrect behavior and will be lost
-       * once the code is regenerated.
-       *
-       */
+            /**
+             * This code was generated by [React Native](https://www.npmjs.com/package/@react-native/gradle-plugin).
+             *
+             * Do not edit this file as changes may cause incorrect behavior and will be lost
+             * once the code is regenerated.
+             *
+             */
 
-      #include "autolinking.h"
+            #include "autolinking.h"
 
 
-      namespace facebook {
-      namespace react {
+            namespace facebook {
+            namespace react {
 
-      std::shared_ptr<TurboModule> autolinking_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
+            std::shared_ptr<TurboModule> autolinking_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
 
-        return nullptr;
-      }
+              return nullptr;
+            }
 
-      std::shared_ptr<TurboModule> autolinking_cxxModuleProvider(const std::string moduleName, const std::shared_ptr<CallInvoker>& jsInvoker) {
+            std::shared_ptr<TurboModule> autolinking_cxxModuleProvider(const std::string moduleName, const std::shared_ptr<CallInvoker>& jsInvoker) {
 
-        return nullptr;
-      }
+              return nullptr;
+            }
 
-      void autolinking_registerProviders(std::shared_ptr<ComponentDescriptorProviderRegistry const> providerRegistry) {
+            void autolinking_registerProviders(std::shared_ptr<ComponentDescriptorProviderRegistry const> providerRegistry) {
 
-        return;
-      }
+              return;
+            }
 
-      } // namespace react
-      } // namespace facebook
-    """
+            } // namespace react
+            } // namespace facebook
+            """
                 .trimIndent()
         )
   }
@@ -223,50 +223,50 @@ class GenerateAutolinkingNewArchitecturesFileTaskTest {
     assertThat(output)
         .isEqualTo(
             """
-      /**
-       * This code was generated by [React Native](https://www.npmjs.com/package/@react-native/gradle-plugin).
-       *
-       * Do not edit this file as changes may cause incorrect behavior and will be lost
-       * once the code is regenerated.
-       *
-       */
+            /**
+             * This code was generated by [React Native](https://www.npmjs.com/package/@react-native/gradle-plugin).
+             *
+             * Do not edit this file as changes may cause incorrect behavior and will be lost
+             * once the code is regenerated.
+             *
+             */
 
-      #include "autolinking.h"
-      #include <aPackage.h>
-      #include <anotherPackage.h>
-      #include <react/renderer/components/anotherPackage/ComponentDescriptors.h>
-      #include <AnotherCxxModule.h>
+            #include "autolinking.h"
+            #include <aPackage.h>
+            #include <anotherPackage.h>
+            #include <react/renderer/components/anotherPackage/ComponentDescriptors.h>
+            #include <AnotherCxxModule.h>
 
-      namespace facebook {
-      namespace react {
+            namespace facebook {
+            namespace react {
 
-      std::shared_ptr<TurboModule> autolinking_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
-      auto module_aPackage = aPackage_ModuleProvider(moduleName, params);
-      if (module_aPackage != nullptr) {
-      return module_aPackage;
-      }
-      auto module_anotherPackage = anotherPackage_ModuleProvider(moduleName, params);
-      if (module_anotherPackage != nullptr) {
-      return module_anotherPackage;
-      }
-        return nullptr;
-      }
+            std::shared_ptr<TurboModule> autolinking_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
+            auto module_aPackage = aPackage_ModuleProvider(moduleName, params);
+            if (module_aPackage != nullptr) {
+            return module_aPackage;
+            }
+            auto module_anotherPackage = anotherPackage_ModuleProvider(moduleName, params);
+            if (module_anotherPackage != nullptr) {
+            return module_anotherPackage;
+            }
+              return nullptr;
+            }
 
-      std::shared_ptr<TurboModule> autolinking_cxxModuleProvider(const std::string moduleName, const std::shared_ptr<CallInvoker>& jsInvoker) {
-      if (moduleName == AnotherCxxModule::kModuleName) {
-      return std::make_shared<AnotherCxxModule>(jsInvoker);
-      }
-        return nullptr;
-      }
+            std::shared_ptr<TurboModule> autolinking_cxxModuleProvider(const std::string moduleName, const std::shared_ptr<CallInvoker>& jsInvoker) {
+            if (moduleName == AnotherCxxModule::kModuleName) {
+            return std::make_shared<AnotherCxxModule>(jsInvoker);
+            }
+              return nullptr;
+            }
 
-      void autolinking_registerProviders(std::shared_ptr<ComponentDescriptorProviderRegistry const> providerRegistry) {
-      providerRegistry->add(concreteComponentDescriptorProvider<AnotherPackageComponentDescriptor>());
-        return;
-      }
+            void autolinking_registerProviders(std::shared_ptr<ComponentDescriptorProviderRegistry const> providerRegistry) {
+            providerRegistry->add(concreteComponentDescriptorProvider<AnotherPackageComponentDescriptor>());
+              return;
+            }
 
-      } // namespace react
-      } // namespace facebook
-    """
+            } // namespace react
+            } // namespace facebook
+            """
                 .trimIndent()
         )
   }

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTaskTest.kt

@@ -138,16 +138,16 @@ class GenerateCodegenArtifactsTaskTest {
           // language=JSON
           writeText(
               """
-        {
-            "name": "@a/library",
-            "codegenConfig": {
-                "name": "an-awesome-library",
-                "android": {
-                  "javaPackageName": "com.awesome.package"
-                }
-            }
-        }
-        """
+              {
+                  "name": "@a/library",
+                  "codegenConfig": {
+                      "name": "an-awesome-library",
+                      "android": {
+                        "javaPackageName": "com.awesome.package"
+                      }
+                  }
+              }
+              """
                   .trimIndent()
           )
         }
@@ -172,12 +172,12 @@ class GenerateCodegenArtifactsTaskTest {
           // language=JSON
           writeText(
               """
-        {
-            "name": "@a/library",
-            "codegenConfig": {
-            }
-        }
-        """
+              {
+                  "name": "@a/library",
+                  "codegenConfig": {
+                  }
+              }
+              """
                   .trimIndent()
           )
         }

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GenerateEntryPointTaskTest.kt

@@ -47,45 +47,45 @@ class GenerateEntryPointTaskTest {
     assertThat(result)
         .isEqualTo(
             """
-        package com.facebook.react;
-        
-        import android.app.Application;
-        import android.content.Context;
-        import android.content.res.Resources;
-        
-        import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
-        import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger;
-        import com.facebook.react.views.view.WindowUtilKt;
-        import com.facebook.react.soloader.OpenSourceMergedSoMapping;
-        import com.facebook.soloader.SoLoader;
-        
-        import java.io.IOException;
-        
-        /**
-          * This class is the entry point for loading React Native using the configuration
-          * that the users specifies in their .gradle files.
-          *
-          * The `loadReactNative(this)` method invocation should be called inside the
-          * application onCreate otherwise the app won't load correctly.            
-          */
-        public class ReactNativeApplicationEntryPoint {
-          public static void loadReactNative(Context context) {
-            try {
-               SoLoader.init(context, OpenSourceMergedSoMapping.INSTANCE);
-            } catch (IOException error) {
-              throw new RuntimeException(error);
+            package com.facebook.react;
+
+            import android.app.Application;
+            import android.content.Context;
+            import android.content.res.Resources;
+
+            import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
+            import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger;
+            import com.facebook.react.views.view.WindowUtilKt;
+            import com.facebook.react.soloader.OpenSourceMergedSoMapping;
+            import com.facebook.soloader.SoLoader;
+
+            import java.io.IOException;
+
+            /**
+              * This class is the entry point for loading React Native using the configuration
+              * that the users specifies in their .gradle files.
+              *
+              * The `loadReactNative(this)` method invocation should be called inside the
+              * application onCreate otherwise the app won't load correctly.            
+              */
+            public class ReactNativeApplicationEntryPoint {
+              public static void loadReactNative(Context context) {
+                try {
+                   SoLoader.init(context, OpenSourceMergedSoMapping.INSTANCE);
+                } catch (IOException error) {
+                  throw new RuntimeException(error);
+                }
+                
+                if (com.facebook.react.BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+                  DefaultNewArchitectureEntryPoint.load();
+                }
+                
+                if (com.facebook.react.BuildConfig.IS_EDGE_TO_EDGE_ENABLED) {
+                  WindowUtilKt.setEdgeToEdgeFeatureFlagOn();
+                }
+              }
             }
-            
-            if (com.facebook.react.BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-              DefaultNewArchitectureEntryPoint.load();
-            }
-            
-            if (com.facebook.react.BuildConfig.IS_EDGE_TO_EDGE_ENABLED) {
-              WindowUtilKt.setEdgeToEdgeFeatureFlagOn();
-            }
-          }
-        }
-    """
+            """
                 .trimIndent()
         )
   }

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/GeneratePackageListTaskTest.kt

@@ -33,9 +33,9 @@ class GeneratePackageListTaskTest {
     val inputFile = tempFolder.newFile("config.json")
 
     val task =
-        createTestTask<GeneratePackageListTask> {
-          it.generatedOutputDirectory.set(outputFolder)
-          it.autolinkInputFile.set(inputFile)
+        createTestTask<GeneratePackageListTask> { testTask ->
+          testTask.generatedOutputDirectory.set(outputFolder)
+          testTask.autolinkInputFile.set(inputFile)
         }
 
     assertThat(task.inputs.files.singleFile).isEqualTo(inputFile)
@@ -59,11 +59,11 @@ class GeneratePackageListTaskTest {
     assertThat(result)
         .isEqualTo(
             """
-      // @react-native/a-package
-      import com.facebook.react.aPackage;
-      // @react-native/another-package
-      import com.facebook.react.anotherPackage;
-    """
+            // @react-native/a-package
+            import com.facebook.react.aPackage;
+            // @react-native/another-package
+            import com.facebook.react.anotherPackage;
+            """
                 .trimIndent()
         )
   }
@@ -85,10 +85,10 @@ class GeneratePackageListTaskTest {
     assertThat(result)
         .isEqualTo(
             """
-      ,
-            new APackage(),
-            new AnotherPackage()
-    """
+            ,
+                  new APackage(),
+                  new AnotherPackage()
+            """
                 .trimIndent()
         )
   }
@@ -234,69 +234,69 @@ class GeneratePackageListTaskTest {
     assertThat(result)
         .isEqualTo(
             """
-    package com.facebook.react;
+            package com.facebook.react;
 
-    import android.app.Application;
-    import android.content.Context;
-    import android.content.res.Resources;
+            import android.app.Application;
+            import android.content.Context;
+            import android.content.res.Resources;
 
-    import com.facebook.react.ReactPackage;
-    import com.facebook.react.shell.MainPackageConfig;
-    import com.facebook.react.shell.MainReactPackage;
-    import java.util.Arrays;
-    import java.util.ArrayList;
+            import com.facebook.react.ReactPackage;
+            import com.facebook.react.shell.MainPackageConfig;
+            import com.facebook.react.shell.MainReactPackage;
+            import java.util.Arrays;
+            import java.util.ArrayList;
 
 
 
-    @SuppressWarnings("deprecation")
-    public class PackageList {
-      private Application application;
-      private ReactNativeHost reactNativeHost;
-      private MainPackageConfig mConfig;
+            @SuppressWarnings("deprecation")
+            public class PackageList {
+              private Application application;
+              private ReactNativeHost reactNativeHost;
+              private MainPackageConfig mConfig;
 
-      public PackageList(ReactNativeHost reactNativeHost) {
-        this(reactNativeHost, null);
-      }
+              public PackageList(ReactNativeHost reactNativeHost) {
+                this(reactNativeHost, null);
+              }
 
-      public PackageList(Application application) {
-        this(application, null);
-      }
+              public PackageList(Application application) {
+                this(application, null);
+              }
 
-      public PackageList(ReactNativeHost reactNativeHost, MainPackageConfig config) {
-        this.reactNativeHost = reactNativeHost;
-        mConfig = config;
-      }
+              public PackageList(ReactNativeHost reactNativeHost, MainPackageConfig config) {
+                this.reactNativeHost = reactNativeHost;
+                mConfig = config;
+              }
 
-      public PackageList(Application application, MainPackageConfig config) {
-        this.reactNativeHost = null;
-        this.application = application;
-        mConfig = config;
-      }
+              public PackageList(Application application, MainPackageConfig config) {
+                this.reactNativeHost = null;
+                this.application = application;
+                mConfig = config;
+              }
 
-      private ReactNativeHost getReactNativeHost() {
-        return this.reactNativeHost;
-      }
+              private ReactNativeHost getReactNativeHost() {
+                return this.reactNativeHost;
+              }
 
-      private Resources getResources() {
-        return this.getApplication().getResources();
-      }
+              private Resources getResources() {
+                return this.getApplication().getResources();
+              }
 
-      private Application getApplication() {
-        if (this.reactNativeHost == null) return this.application;
-        return this.reactNativeHost.getApplication();
-      }
+              private Application getApplication() {
+                if (this.reactNativeHost == null) return this.application;
+                return this.reactNativeHost.getApplication();
+              }
 
-      private Context getApplicationContext() {
-        return this.getApplication().getApplicationContext();
-      }
+              private Context getApplicationContext() {
+                return this.getApplication().getApplicationContext();
+              }
 
-      public ArrayList<ReactPackage> getPackages() {
-        return new ArrayList<>(Arrays.<ReactPackage>asList(
-          new MainReactPackage(mConfig)
-        ));
-      }
-    }
-    """
+              public ArrayList<ReactPackage> getPackages() {
+                return new ArrayList<>(Arrays.<ReactPackage>asList(
+                  new MainReactPackage(mConfig)
+                ));
+              }
+            }
+            """
                 .trimIndent()
         )
   }
@@ -312,74 +312,74 @@ class GeneratePackageListTaskTest {
     assertThat(result)
         .isEqualTo(
             """
-    package com.facebook.react;
+            package com.facebook.react;
 
-    import android.app.Application;
-    import android.content.Context;
-    import android.content.res.Resources;
+            import android.app.Application;
+            import android.content.Context;
+            import android.content.res.Resources;
 
-    import com.facebook.react.ReactPackage;
-    import com.facebook.react.shell.MainPackageConfig;
-    import com.facebook.react.shell.MainReactPackage;
-    import java.util.Arrays;
-    import java.util.ArrayList;
+            import com.facebook.react.ReactPackage;
+            import com.facebook.react.shell.MainPackageConfig;
+            import com.facebook.react.shell.MainReactPackage;
+            import java.util.Arrays;
+            import java.util.ArrayList;
 
-    // @react-native/a-package
-    import com.facebook.react.aPackage;
-    // @react-native/another-package
-    import com.facebook.react.anotherPackage;
-    
-    @SuppressWarnings("deprecation")
-    public class PackageList {
-      private Application application;
-      private ReactNativeHost reactNativeHost;
-      private MainPackageConfig mConfig;
+            // @react-native/a-package
+            import com.facebook.react.aPackage;
+            // @react-native/another-package
+            import com.facebook.react.anotherPackage;
 
-      public PackageList(ReactNativeHost reactNativeHost) {
-        this(reactNativeHost, null);
-      }
+            @SuppressWarnings("deprecation")
+            public class PackageList {
+              private Application application;
+              private ReactNativeHost reactNativeHost;
+              private MainPackageConfig mConfig;
 
-      public PackageList(Application application) {
-        this(application, null);
-      }
+              public PackageList(ReactNativeHost reactNativeHost) {
+                this(reactNativeHost, null);
+              }
 
-      public PackageList(ReactNativeHost reactNativeHost, MainPackageConfig config) {
-        this.reactNativeHost = reactNativeHost;
-        mConfig = config;
-      }
+              public PackageList(Application application) {
+                this(application, null);
+              }
 
-      public PackageList(Application application, MainPackageConfig config) {
-        this.reactNativeHost = null;
-        this.application = application;
-        mConfig = config;
-      }
+              public PackageList(ReactNativeHost reactNativeHost, MainPackageConfig config) {
+                this.reactNativeHost = reactNativeHost;
+                mConfig = config;
+              }
 
-      private ReactNativeHost getReactNativeHost() {
-        return this.reactNativeHost;
-      }
+              public PackageList(Application application, MainPackageConfig config) {
+                this.reactNativeHost = null;
+                this.application = application;
+                mConfig = config;
+              }
 
-      private Resources getResources() {
-        return this.getApplication().getResources();
-      }
+              private ReactNativeHost getReactNativeHost() {
+                return this.reactNativeHost;
+              }
 
-      private Application getApplication() {
-        if (this.reactNativeHost == null) return this.application;
-        return this.reactNativeHost.getApplication();
-      }
+              private Resources getResources() {
+                return this.getApplication().getResources();
+              }
 
-      private Context getApplicationContext() {
-        return this.getApplication().getApplicationContext();
-      }
+              private Application getApplication() {
+                if (this.reactNativeHost == null) return this.application;
+                return this.reactNativeHost.getApplication();
+              }
 
-      public ArrayList<ReactPackage> getPackages() {
-        return new ArrayList<>(Arrays.<ReactPackage>asList(
-          new MainReactPackage(mConfig),
-          new APackage(),
-          new AnotherPackage()
-        ));
-      }
-    }
-    """
+              private Context getApplicationContext() {
+                return this.getApplication().getApplicationContext();
+              }
+
+              public ArrayList<ReactPackage> getPackages() {
+                return new ArrayList<>(Arrays.<ReactPackage>asList(
+                  new MainReactPackage(mConfig),
+                  new APackage(),
+                  new AnotherPackage()
+                ));
+              }
+            }
+            """
                 .trimIndent()
         )
   }

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareGflagsTaskTest.kt

@@ -82,11 +82,11 @@ class PrepareGflagsTaskTest {
     val gflagsThirdPartyPath = tempFolder.newFolder("gflagspath/jni")
     val output = tempFolder.newFolder("output")
     val task =
-        createTestTask<PrepareGflagsTask> {
-          it.gflagsPath.setFrom(gflagspath)
-          it.gflagsThirdPartyPath.set(gflagsThirdPartyPath)
-          it.gflagsVersion.set("1.0.0")
-          it.outputDir.set(output)
+        createTestTask<PrepareGflagsTask> { taskConfig ->
+          taskConfig.gflagsPath.setFrom(gflagspath)
+          taskConfig.gflagsThirdPartyPath.set(gflagsThirdPartyPath)
+          taskConfig.gflagsVersion.set("1.0.0")
+          taskConfig.outputDir.set(output)
         }
     File(gflagspath, "gflags-1.0.0/src/gflags_declare.h.in").apply {
       parentFile.mkdirs()

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PrepareGlogTaskTest.kt

@@ -98,11 +98,11 @@ class PrepareGlogTaskTest {
     val glogThirdPartyJniPath = tempFolder.newFolder("glogpath/jni")
     val output = tempFolder.newFolder("output")
     val task =
-        createTestTask<PrepareGlogTask> {
-          it.glogPath.setFrom(glogpath)
-          it.glogThirdPartyJniPath.set(glogThirdPartyJniPath)
-          it.glogVersion.set("1.0.0")
-          it.outputDir.set(output)
+        createTestTask<PrepareGlogTask> { task ->
+          task.glogPath.setFrom(glogpath)
+          task.glogThirdPartyJniPath.set(glogThirdPartyJniPath)
+          task.glogVersion.set("1.0.0")
+          task.outputDir.set(output)
         }
     File(glogpath, "glog-1.0.0/src/glog.h.in").apply {
       parentFile.mkdirs()

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/AgpConfiguratorUtilsTest.kt

@@ -34,9 +34,9 @@ class AgpConfiguratorUtilsTest {
           writeText(
               // language=xml
               """
-          <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-          </manifest>
-          """
+              <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+              </manifest>
+              """
                   .trimIndent()
           )
         }
@@ -53,9 +53,9 @@ class AgpConfiguratorUtilsTest {
           writeText(
               // language=xml
               """
-          <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.facebook.react" >
-          </manifest>
-          """
+              <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.facebook.react" >
+              </manifest>
+              """
                   .trimIndent()
           )
         }

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/DependencyUtilsTest.kt

@@ -275,71 +275,160 @@ class DependencyUtilsTest {
   fun configureDependencies_withEmptyVersion_doesNothing() {
     val project = createProject()
 
-    configureDependencies(project, "")
+    configureDependencies(project, DependencyUtils.Coordinates("", "", ""))
 
     assertThat(project.configurations.first().resolutionStrategy.forcedModules.isEmpty()).isTrue()
   }
 
   @Test
-  fun configureDependencies_withVersionString_appliesResolutionStrategy() {
+  fun configureDependencies_withVersionString_appliesResolutionStrategy_withClassicHermes() {
     val project = createProject()
 
-    configureDependencies(project, "1.2.3")
+    configureDependencies(project, DependencyUtils.Coordinates("1.2.3", "4.5.6", "7.8.9"))
 
     val forcedModules = project.configurations.first().resolutionStrategy.forcedModules
     assertThat(forcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
         .isTrue()
-    assertThat(forcedModules.any { it.toString() == "com.facebook.react:hermes-android:1.2.3" })
+    assertThat(forcedModules.any { it.toString() == "com.facebook.react:hermes-android:4.5.6" })
         .isTrue()
   }
 
   @Test
-  fun configureDependencies_withVersionString_appliesOnAllProjects() {
+  fun configureDependencies_withVersionString_appliesResolutionStrategy_withHermesV1() {
+    val project = createProject()
+
+    configureDependencies(
+        project,
+        DependencyUtils.Coordinates("1.2.3", "4.5.6", "7.8.9"),
+        hermesV1Enabled = true,
+    )
+
+    val forcedModules = project.configurations.first().resolutionStrategy.forcedModules
+    assertThat(forcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
+        .isTrue()
+    assertThat(forcedModules.any { it.toString() == "com.facebook.hermes:hermes-android:7.8.9" })
+        .isTrue()
+  }
+
+  @Test
+  fun configureDependencies_withVersionString_appliesOnAllProjects_withClassicHermes() {
     val rootProject = ProjectBuilder.builder().build()
     val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
     val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
     appProject.plugins.apply("com.android.application")
     libProject.plugins.apply("com.android.library")
 
-    configureDependencies(appProject, "1.2.3")
+    configureDependencies(appProject, DependencyUtils.Coordinates("1.2.3", "4.5.6", "7.8.9"))
 
     val appForcedModules = appProject.configurations.first().resolutionStrategy.forcedModules
     val libForcedModules = libProject.configurations.first().resolutionStrategy.forcedModules
     assertThat(appForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
         .isTrue()
-    assertThat(appForcedModules.any { it.toString() == "com.facebook.react:hermes-android:1.2.3" })
+    assertThat(appForcedModules.any { it.toString() == "com.facebook.react:hermes-android:4.5.6" })
         .isTrue()
     assertThat(libForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
         .isTrue()
-    assertThat(libForcedModules.any { it.toString() == "com.facebook.react:hermes-android:1.2.3" })
+    assertThat(libForcedModules.any { it.toString() == "com.facebook.react:hermes-android:4.5.6" })
         .isTrue()
   }
 
   @Test
-  fun configureDependencies_withVersionStringAndGroupString_appliesOnAllProjects() {
+  fun configureDependencies_withVersionString_appliesOnAllProjects_withHermesV1() {
     val rootProject = ProjectBuilder.builder().build()
     val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
     val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
     appProject.plugins.apply("com.android.application")
     libProject.plugins.apply("com.android.library")
 
-    configureDependencies(appProject, "1.2.3", "io.github.test")
+    configureDependencies(
+        appProject,
+        DependencyUtils.Coordinates("1.2.3", "4.5.6", "7.8.9"),
+        hermesV1Enabled = true,
+    )
+
+    val appForcedModules = appProject.configurations.first().resolutionStrategy.forcedModules
+    val libForcedModules = libProject.configurations.first().resolutionStrategy.forcedModules
+    assertThat(appForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
+        .isTrue()
+    assertThat(appForcedModules.any { it.toString() == "com.facebook.hermes:hermes-android:7.8.9" })
+        .isTrue()
+    assertThat(libForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
+        .isTrue()
+    assertThat(libForcedModules.any { it.toString() == "com.facebook.hermes:hermes-android:7.8.9" })
+        .isTrue()
+  }
+
+  @Test
+  fun configureDependencies_withVersionStringAndGroupString_appliesOnAllProjects_withClassicHermes() {
+    val rootProject = ProjectBuilder.builder().build()
+    val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
+    val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
+    appProject.plugins.apply("com.android.application")
+    libProject.plugins.apply("com.android.library")
+
+    configureDependencies(
+        appProject,
+        DependencyUtils.Coordinates(
+            "1.2.3",
+            "4.5.6",
+            "7.8.9",
+            "io.github.test",
+            "io.github.test.hermes",
+        ),
+    )
 
     val appForcedModules = appProject.configurations.first().resolutionStrategy.forcedModules
     val libForcedModules = libProject.configurations.first().resolutionStrategy.forcedModules
     assertThat(appForcedModules.any { it.toString() == "io.github.test:react-android:1.2.3" })
         .isTrue()
-    assertThat(appForcedModules.any { it.toString() == "io.github.test:hermes-android:1.2.3" })
+    assertThat(appForcedModules.any { it.toString() == "io.github.test:hermes-android:4.5.6" })
         .isTrue()
     assertThat(libForcedModules.any { it.toString() == "io.github.test:react-android:1.2.3" })
         .isTrue()
-    assertThat(libForcedModules.any { it.toString() == "io.github.test:hermes-android:1.2.3" })
+    assertThat(libForcedModules.any { it.toString() == "io.github.test:hermes-android:4.5.6" })
         .isTrue()
   }
 
   @Test
-  fun getDependencySubstitutions_withDefaultGroup_substitutesCorrectly() {
-    val dependencySubstitutions = getDependencySubstitutions("0.42.0")
+  fun configureDependencies_withVersionStringAndGroupString_appliesOnAllProjects_withHermesV1() {
+    val rootProject = ProjectBuilder.builder().build()
+    val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
+    val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
+    appProject.plugins.apply("com.android.application")
+    libProject.plugins.apply("com.android.library")
+
+    configureDependencies(
+        appProject,
+        DependencyUtils.Coordinates(
+            "1.2.3",
+            "4.5.6",
+            "7.8.9",
+            "io.github.test",
+            "io.github.test.hermes",
+        ),
+        hermesV1Enabled = true,
+    )
+
+    val appForcedModules = appProject.configurations.first().resolutionStrategy.forcedModules
+    val libForcedModules = libProject.configurations.first().resolutionStrategy.forcedModules
+    assertThat(appForcedModules.any { it.toString() == "io.github.test:react-android:1.2.3" })
+        .isTrue()
+    assertThat(
+            appForcedModules.any { it.toString() == "io.github.test.hermes:hermes-android:7.8.9" }
+        )
+        .isTrue()
+    assertThat(libForcedModules.any { it.toString() == "io.github.test:react-android:1.2.3" })
+        .isTrue()
+    assertThat(
+            libForcedModules.any { it.toString() == "io.github.test.hermes:hermes-android:7.8.9" }
+        )
+        .isTrue()
+  }
+
+  @Test
+  fun getDependencySubstitutions_withDefaultGroup_substitutesCorrectly_withClassicHermes() {
+    val dependencySubstitutions =
+        getDependencySubstitutions(DependencyUtils.Coordinates("0.42.0", "0.42.0", "0.43.0"))
 
     assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
     assertThat("com.facebook.react:react-android:0.42.0")
@@ -358,8 +447,41 @@ class DependencyUtilsTest {
   }
 
   @Test
-  fun getDependencySubstitutions_withCustomGroup_substitutesCorrectly() {
-    val dependencySubstitutions = getDependencySubstitutions("0.42.0", "io.github.test")
+  fun getDependencySubstitutions_withDefaultGroup_substitutesCorrectly_withHermesV1() {
+    val dependencySubstitutions =
+        getDependencySubstitutions(
+            DependencyUtils.Coordinates("0.42.0", "0.42.0", "0.43.0"),
+            hermesV1Enabled = true,
+        )
+
+    assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
+    assertThat("com.facebook.react:react-android:0.42.0")
+        .isEqualTo(dependencySubstitutions[0].second)
+    assertThat(
+            "The react-native artifact was deprecated in favor of react-android due to https://github.com/facebook/react-native/issues/35210."
+        )
+        .isEqualTo(dependencySubstitutions[0].third)
+    assertThat("com.facebook.react:hermes-engine").isEqualTo(dependencySubstitutions[1].first)
+    assertThat("com.facebook.hermes:hermes-android:0.43.0")
+        .isEqualTo(dependencySubstitutions[1].second)
+    assertThat(
+            "The hermes-engine artifact was deprecated in favor of hermes-android due to https://github.com/facebook/react-native/issues/35210."
+        )
+        .isEqualTo(dependencySubstitutions[1].third)
+  }
+
+  @Test
+  fun getDependencySubstitutions_withCustomGroup_substitutesCorrectly_withClassicHermes() {
+    val dependencySubstitutions =
+        getDependencySubstitutions(
+            DependencyUtils.Coordinates(
+                "0.42.0",
+                "0.42.0",
+                "0.43.0",
+                "io.github.test",
+                "io.github.test.hermes",
+            )
+        )
 
     assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
     assertThat("io.github.test:react-android:0.42.0").isEqualTo(dependencySubstitutions[0].second)
@@ -383,22 +505,76 @@ class DependencyUtilsTest {
         .isEqualTo(dependencySubstitutions[3].third)
   }
 
+  @Test
+  fun getDependencySubstitutions_withCustomGroup_substitutesCorrectly_withHermesV1() {
+    val dependencySubstitutions =
+        getDependencySubstitutions(
+            DependencyUtils.Coordinates(
+                "0.42.0",
+                "0.42.0",
+                "0.43.0",
+                "io.github.test",
+                "io.github.test.hermes",
+            ),
+            hermesV1Enabled = true,
+        )
+
+    assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
+    assertThat("io.github.test:react-android:0.42.0").isEqualTo(dependencySubstitutions[0].second)
+    assertThat(
+            "The react-native artifact was deprecated in favor of react-android due to https://github.com/facebook/react-native/issues/35210."
+        )
+        .isEqualTo(dependencySubstitutions[0].third)
+    assertThat("com.facebook.react:hermes-engine").isEqualTo(dependencySubstitutions[1].first)
+    assertThat("io.github.test.hermes:hermes-android:0.43.0")
+        .isEqualTo(dependencySubstitutions[1].second)
+    assertThat(
+            "The hermes-engine artifact was deprecated in favor of hermes-android due to https://github.com/facebook/react-native/issues/35210."
+        )
+        .isEqualTo(dependencySubstitutions[1].third)
+    assertThat("com.facebook.react:react-android").isEqualTo(dependencySubstitutions[2].first)
+    assertThat("io.github.test:react-android:0.42.0").isEqualTo(dependencySubstitutions[2].second)
+    assertThat("The react-android dependency was modified to use the correct Maven group.")
+        .isEqualTo(dependencySubstitutions[2].third)
+    assertThat("com.facebook.react:hermes-android").isEqualTo(dependencySubstitutions[3].first)
+    assertThat("io.github.test.hermes:hermes-android:0.43.0")
+        .isEqualTo(dependencySubstitutions[3].second)
+    assertThat("The hermes-android dependency was modified to use the correct Maven group.")
+        .isEqualTo(dependencySubstitutions[3].third)
+  }
+
   @Test
   fun readVersionString_withCorrectVersionString_returnsIt() {
     val propertiesFile =
         tempFolder.newFile("gradle.properties").apply {
           writeText(
               """
-        VERSION_NAME=1000.0.0
-        ANOTHER_PROPERTY=true
-      """
+              VERSION_NAME=1000.0.0
+              ANOTHER_PROPERTY=true
+              """
                   .trimIndent()
           )
         }
 
-    val versionString = readVersionAndGroupStrings(propertiesFile).first
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+              HERMES_V1_VERSION_NAME=1000.0.0
+              ANOTHER_PROPERTY=true
+              """
+                  .trimIndent()
+          )
+        }
+
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val versionString = strings.versionString
+    val hermesVersionString = strings.hermesVersionString
+    val hermesV1VersionString = strings.hermesV1VersionString
 
     assertThat(versionString).isEqualTo("1000.0.0")
+    assertThat(hermesVersionString).isEqualTo("1000.0.0")
+    assertThat(hermesV1VersionString).isEqualTo("1000.0.0")
   }
 
   @Test
@@ -407,16 +583,34 @@ class DependencyUtilsTest {
         tempFolder.newFile("gradle.properties").apply {
           writeText(
               """
-        VERSION_NAME=0.0.0-20221101-2019-cfe811ab1
-        ANOTHER_PROPERTY=true
-      """
+              VERSION_NAME=0.0.0-20221101-2019-cfe811ab1
+              HERMES_VERSION_NAME=0.12.0-commitly-20221101-2019-cfe811ab1
+              HERMES_V1_VERSION_NAME=250829098.0.0-stable
+              ANOTHER_PROPERTY=true
+              """
                   .trimIndent()
           )
         }
 
-    val versionString = readVersionAndGroupStrings(propertiesFile).first
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+              HERMES_V1_VERSION_NAME=250829098.0.0-stable
+              ANOTHER_PROPERTY=true
+              """
+                  .trimIndent()
+          )
+        }
+
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val versionString = strings.versionString
+    val hermesVersionString = strings.hermesVersionString
+    val hermesV1VersionString = strings.hermesV1VersionString
 
     assertThat(versionString).isEqualTo("0.0.0-20221101-2019-cfe811ab1-SNAPSHOT")
+    assertThat(hermesVersionString).isEqualTo("0.0.0-20221101-2019-cfe811ab1-SNAPSHOT")
+    assertThat(hermesV1VersionString).isEqualTo("250829098.0.0-stable")
   }
 
   @Test
@@ -425,14 +619,29 @@ class DependencyUtilsTest {
         tempFolder.newFile("gradle.properties").apply {
           writeText(
               """
-        ANOTHER_PROPERTY=true
-      """
+              ANOTHER_PROPERTY=true
+              """
                   .trimIndent()
           )
         }
 
-    val versionString = readVersionAndGroupStrings(propertiesFile).first
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+              ANOTHER_PROPERTY=true
+              """
+                  .trimIndent()
+          )
+        }
+
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val versionString = strings.versionString
+    val hermesVersionString = strings.hermesVersionString
+    val hermesV1VersionString = strings.hermesV1VersionString
     assertThat(versionString).isEqualTo("")
+    assertThat(hermesVersionString).isEqualTo("")
+    assertThat(hermesV1VersionString).isEqualTo("")
   }
 
   @Test
@@ -441,15 +650,31 @@ class DependencyUtilsTest {
         tempFolder.newFile("gradle.properties").apply {
           writeText(
               """
-        VERSION_NAME=
-        ANOTHER_PROPERTY=true
-      """
+              VERSION_NAME=
+              ANOTHER_PROPERTY=true
+              """
                   .trimIndent()
           )
         }
 
-    val versionString = readVersionAndGroupStrings(propertiesFile).first
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+              HERMES_V1_VERSION_NAME=
+              ANOTHER_PROPERTY=true
+              """
+                  .trimIndent()
+          )
+        }
+
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val versionString = strings.versionString
+    val hermesVersionString = strings.hermesVersionString
+    val hermesV1VersionString = strings.hermesV1VersionString
     assertThat(versionString).isEqualTo("")
+    assertThat(hermesVersionString).isEqualTo("")
+    assertThat(hermesV1VersionString).isEqualTo("")
   }
 
   @Test
@@ -458,16 +683,31 @@ class DependencyUtilsTest {
         tempFolder.newFile("gradle.properties").apply {
           writeText(
               """
-        react.internal.publishingGroup=io.github.test
-        ANOTHER_PROPERTY=true
-      """
+              react.internal.publishingGroup=io.github.test
+              react.internal.hermesPublishingGroup=io.github.test
+              ANOTHER_PROPERTY=true
+              """
                   .trimIndent()
           )
         }
 
-    val groupString = readVersionAndGroupStrings(propertiesFile).second
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+              HERMES_V1_VERSION_NAME=
+              ANOTHER_PROPERTY=true
+              """
+                  .trimIndent()
+          )
+        }
 
-    assertThat(groupString).isEqualTo("io.github.test")
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val reactGroupString = strings.reactGroupString
+    val hermesGroupString = strings.hermesGroupString
+
+    assertThat(reactGroupString).isEqualTo("io.github.test")
+    assertThat(hermesGroupString).isEqualTo("io.github.test")
   }
 
   @Test
@@ -476,15 +716,29 @@ class DependencyUtilsTest {
         tempFolder.newFile("gradle.properties").apply {
           writeText(
               """
-        ANOTHER_PROPERTY=true
-      """
+              ANOTHER_PROPERTY=true
+              """
                   .trimIndent()
           )
         }
 
-    val groupString = readVersionAndGroupStrings(propertiesFile).second
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+              HERMES_V1_VERSION_NAME=
+              ANOTHER_PROPERTY=true
+              """
+                  .trimIndent()
+          )
+        }
 
-    assertThat(groupString).isEqualTo("com.facebook.react")
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val reactGroupString = strings.reactGroupString
+    val hermesGroupString = strings.hermesGroupString
+
+    assertThat(reactGroupString).isEqualTo("com.facebook.react")
+    assertThat(hermesGroupString).isEqualTo("com.facebook.hermes")
   }
 
   @Test

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/PathUtilsTest.kt

@@ -162,6 +162,16 @@ class PathUtilsTest {
     assertThat(detectOSAwareHermesCommand(tempFolder.root, "")).isEqualTo(expected.toString())
   }
 
+  @Test
+  @WithOs(OS.MAC)
+  fun detectOSAwareHermesCommand_withHermesV1Enabled() {
+    tempFolder.newFolder("node_modules/hermes-compiler/hermesc/osx-bin/")
+    val expected = tempFolder.newFile("node_modules/hermes-compiler/hermesc/osx-bin/hermesc")
+
+    assertThat(detectOSAwareHermesCommand(tempFolder.root, "", hermesV1Enabled = true))
+        .isEqualTo(expected.toString())
+  }
+
   @Test(expected = IllegalStateException::class)
   @WithOs(OS.MAC)
   fun detectOSAwareHermesCommand_failsIfNotFound() {
@@ -310,11 +320,11 @@ class PathUtilsTest {
       writeText(
           // language=json
           """
-      {
-        "name": "a-library",
-        "codegenConfig": {}
-      }
-      """
+          {
+            "name": "a-library",
+            "codegenConfig": {}
+          }
+          """
               .trimIndent()
       )
     }

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/ProjectUtilsTest.kt

@@ -14,6 +14,7 @@ import com.facebook.react.tests.createProject
 import com.facebook.react.utils.ProjectUtils.getReactNativeArchitectures
 import com.facebook.react.utils.ProjectUtils.isEdgeToEdgeEnabled
 import com.facebook.react.utils.ProjectUtils.isHermesEnabled
+import com.facebook.react.utils.ProjectUtils.isHermesV1Enabled
 import com.facebook.react.utils.ProjectUtils.isNewArchEnabled
 import com.facebook.react.utils.ProjectUtils.needsCodegenFromPackageJson
 import java.io.File
@@ -115,6 +116,32 @@ class ProjectUtilsTest {
     assertThat(project.isEdgeToEdgeEnabled).isFalse()
   }
 
+  @Test
+  fun isHermesV1Enabled_returnsFalseByDefault() {
+    assertThat(createProject().isHermesV1Enabled).isFalse()
+  }
+
+  @Test
+  fun isHermesV1Enabled_withDisabledViaProperty_returnsFalse() {
+    val project = createProject()
+    project.extensions.extraProperties.set("hermesV1Enabled", "false")
+    assertThat(project.isHermesV1Enabled).isFalse()
+  }
+
+  @Test
+  fun isHermesV1Enabled_withEnabledViaProperty_returnsTrue() {
+    val project = createProject()
+    project.extensions.extraProperties.set("hermesV1Enabled", "true")
+    assertThat(project.isHermesV1Enabled).isTrue()
+  }
+
+  @Test
+  fun isHermesV1Enabled_withInvalidViaProperty_returnsFalse() {
+    val project = createProject()
+    project.extensions.extraProperties.set("hermesV1Enabled", "¯\\_(ツ)_/¯")
+    assertThat(project.isHermesV1Enabled).isFalse()
+  }
+
   @Test
   fun needsCodegenFromPackageJson_withCodegenConfigInPackageJson_returnsTrue() {
     val project = createProject()
@@ -123,11 +150,11 @@ class ProjectUtilsTest {
       writeText(
           // language=json
           """
-      {
-        "name": "a-library",
-        "codegenConfig": {}
-      }
-      """
+          {
+            "name": "a-library",
+            "codegenConfig": {}
+          }
+          """
               .trimIndent()
       )
     }
@@ -143,10 +170,10 @@ class ProjectUtilsTest {
       writeText(
           // language=json
           """
-      {
-        "name": "a-library"
-      }
-      """
+          {
+            "name": "a-library"
+          }
+          """
               .trimIndent()
       )
     }

packages/gradle-plugin/settings-plugin/src/test/kotlin/com/facebook/react/ReactSettingsExtensionTest.kt

@@ -238,30 +238,30 @@ class ReactSettingsExtensionTest {
         File(generatedFolder, "autolinking.json").apply {
           writeText(
               """
-      {
-        "root": "/",
-        "reactNativePath": "/node_modules/react-native",
-        "reactNativeVersion": "0.75",
-        "dependencies": {},
-        "healthChecks": [],
-        "platforms": {
-          "ios": {},
-          "android": {}
-        },
-        "assets": [],
-        "project": {
-          "ios": {},
-          "android": {
-            "sourceDir": "/",
-            "appName": "app",
-            "packageName": "com.TestApp",
-            "applicationId": "com.TestApp",
-            "mainActivity": ".MainActivity",
-            "assets": []
-          }
-        }
-      }
-    """
+              {
+                "root": "/",
+                "reactNativePath": "/node_modules/react-native",
+                "reactNativeVersion": "0.75",
+                "dependencies": {},
+                "healthChecks": [],
+                "platforms": {
+                  "ios": {},
+                  "android": {}
+                },
+                "assets": [],
+                "project": {
+                  "ios": {},
+                  "android": {
+                    "sourceDir": "/",
+                    "appName": "app",
+                    "packageName": "com.TestApp",
+                    "applicationId": "com.TestApp",
+                    "mainActivity": ".MainActivity",
+                    "assets": []
+                  }
+                }
+              }
+              """
                   .trimIndent()
           )
         }
@@ -309,13 +309,13 @@ class ReactSettingsExtensionTest {
         File(generatedFolder, "autolinking.json").apply {
           writeText(
               """
-      {
-        "project": {
-          "ios": {},
-          "android": {}
-        }
-      }
-    """
+              {
+                "project": {
+                  "ios": {},
+                  "android": {}
+                }
+              }
+              """
                   .trimIndent()
           )
         }

packages/gradle-plugin/shared-testutil/src/main/kotlin/com/facebook/react/tests/OsRule.kt

@@ -25,14 +25,14 @@ class OsRule : TestRule {
       override fun evaluate() {
         val annotation = description.annotations.filterIsInstance<WithOs>().firstOrNull()
 
-        annotation?.os?.propertyName?.let {
+        annotation?.os?.propertyName?.let { osName ->
           retainOs = System.getProperty(OS_NAME_KEY)
-          System.setProperty(OS_NAME_KEY, it)
+          System.setProperty(OS_NAME_KEY, osName)
         }
-        annotation?.arch?.let {
-          if (it.isNotBlank()) {
+        annotation?.arch?.let { arch ->
+          if (arch.isNotBlank()) {
             retainArch = System.getProperty(OS_ARCH_KEY)
-            System.setProperty(OS_ARCH_KEY, it)
+            System.setProperty(OS_ARCH_KEY, arch)
           }
         }
         try {

packages/gradle-plugin/shared/src/test/kotlin/com/facebook/react/utils/JsonUtilsTest.kt

@@ -197,10 +197,10 @@ class JsonUtilsTest {
     val validJson =
         createJsonFile(
             """
-            
+
             > AwesomeProject@0.0.1 npx
             > rnc-cli config
-            
+
              {
               "reactNativeVersion": "1000.0.0",
               "project": {

packages/react-native-babel-preset/src/index.js

@@ -10,11 +10,41 @@
 
 'use strict';
 
+const {version: packageVersion} = require('../package.json');
 const main = require('./configs/main');
 
 module.exports = function (babel, options) {
   return main(options);
 };
 
+let cacheKey;
+module.exports.getCacheKey = () => {
+  if (cacheKey != null) {
+    // Memoize
+    return cacheKey;
+  }
+  if (!packageVersion.endsWith('-main')) {
+    // Assume the integrity of package contents for published npm releases.
+    cacheKey = packageVersion;
+    return cacheKey;
+  }
+  // For anyone working with a `-main` version, contents may vary over time
+  // even though the version does not. Hash the relevant contents of this
+  // package. Lazy-load dependencies we only need on this slow path.
+  const {createHash} = require('crypto');
+  const {readFileSync} = require('fs');
+  const key = createHash('md5');
+  [
+    readFileSync(__filename),
+    readFileSync(require.resolve('./configs/main.js')),
+    readFileSync(require.resolve('./configs/hmr.js')),
+    readFileSync(require.resolve('./configs/lazy-imports.js')),
+    readFileSync(require.resolve('./passthrough-syntax-plugins.js')),
+    readFileSync(require.resolve('./plugin-warn-on-deep-imports.js')),
+  ].forEach(part => key.update(part));
+  cacheKey = key.digest('hex');
+  return cacheKey;
+};
+
 module.exports.getPreset = main.getPreset;
 module.exports.passthroughSyntaxPlugins = require('./passthrough-syntax-plugins');

packages/react-native-babel-transformer/src/index.js

@@ -23,13 +23,14 @@ import type {
 */
 
 const {parseSync, transformFromAstSync} = require('@babel/core');
+const {getCacheKey: getPresetCacheKey} = require('@react-native/babel-preset');
 const makeHMRConfig = require('@react-native/babel-preset/src/configs/hmr');
 const crypto = require('crypto');
 const fs = require('fs');
 const nullthrows = require('nullthrows');
 const path = require('path');
 
-const cacheKeyParts = [fs.readFileSync(__filename)];
+const cacheKeyParts = [getPresetCacheKey(), fs.readFileSync(__filename)];
 
 // TS detection conditions copied from @react-native/babel-preset
 function isTypeScriptSource(fileName /*: string */) {

packages/react-native-codegen/src/cli/combine/combine-js-to-schema.js

@@ -47,7 +47,7 @@ function combineSchemas(
       }
       return merged;
     },
-    {modules: {}},
+    {modules: {} /*:: as SchemaType['modules'] */},
   );
 
   return {

packages/react-native-codegen/src/parsers/parsers-commons.js

@@ -540,7 +540,7 @@ function buildEventEmitterSchema(
 
   return {
     name: eventemitterName,
-    optional: false,
+    optional: Boolean(property.optional),
     typeAnnotation: {
       type: 'EventEmitterTypeAnnotation',
       typeAnnotation: eventTypeAnnotation,

packages/react-native/Libraries/Animated/__tests__/Animated-test.js

@@ -873,56 +873,6 @@ describe('Animated', () => {
     });
   });
 
-  describe('Animated Interactions', () => {
-    let Animated; // eslint-disable-line no-shadow
-    let InteractionManager;
-
-    beforeEach(() => {
-      jest.mock('../../Interaction/InteractionManager');
-      Animated = require('../Animated').default;
-      InteractionManager =
-        require('../../Interaction/InteractionManager').default;
-    });
-
-    afterEach(() => {
-      jest.unmock('../../Interaction/InteractionManager');
-    });
-
-    it('registers an interaction by default', () => {
-      // $FlowFixMe[prop-missing]
-      InteractionManager.createInteractionHandle.mockReturnValue(777);
-
-      const value = new Animated.Value(0);
-      const callback = jest.fn();
-      Animated.timing(value, {
-        toValue: 100,
-        duration: 100,
-        useNativeDriver: false,
-      }).start(callback);
-      jest.runAllTimers();
-
-      expect(InteractionManager.createInteractionHandle).toBeCalled();
-      expect(InteractionManager.clearInteractionHandle).toBeCalledWith(777);
-      expect(callback).toBeCalledWith({finished: true});
-    });
-
-    it('does not register an interaction when specified', () => {
-      const value = new Animated.Value(0);
-      const callback = jest.fn();
-      Animated.timing(value, {
-        toValue: 100,
-        duration: 100,
-        isInteraction: false,
-        useNativeDriver: false,
-      }).start(callback);
-      jest.runAllTimers();
-
-      expect(InteractionManager.createInteractionHandle).not.toBeCalled();
-      expect(InteractionManager.clearInteractionHandle).not.toBeCalled();
-      expect(callback).toBeCalledWith({finished: true});
-    });
-  });
-
   describe('Animated Tracking', () => {
     it('should track values', () => {
       const value1 = new Animated.Value(0);

packages/react-native/Libraries/Animated/components/AnimatedFlatList.js

@@ -14,8 +14,10 @@ import FlatList, {type FlatListProps} from '../../Lists/FlatList';
 import createAnimatedComponent from '../createAnimatedComponent';
 import * as React from 'react';
 
-// $FlowExpectedError[unclear-type]
-export default (createAnimatedComponent(FlatList): component<ItemT = any>(
+export default createAnimatedComponent(FlatList) as $FlowFixMe as component<
+  // $FlowExpectedError[unclear-type]
+  ItemT = any,
+>(
   ref?: React.RefSetter<FlatList<ItemT>>,
   ...props: AnimatedProps<FlatListProps<ItemT>>
-));
+);

packages/react-native/Libraries/Animated/components/AnimatedImage.js

@@ -14,9 +14,10 @@ import Image from '../../Image/Image';
 import createAnimatedComponent from '../createAnimatedComponent';
 import * as React from 'react';
 
-export default (createAnimatedComponent(
-  (Image: $FlowFixMe),
-): AnimatedComponentType<
+export default (createAnimatedComponent<
+  $FlowFixMe,
+  React.ElementRef<typeof Image>,
+>((Image: $FlowFixMe)): AnimatedComponentType<
   React.ElementConfig<typeof Image>,
   React.ElementRef<typeof Image>,
 >);

packages/react-native/Libraries/Animated/components/AnimatedSectionList.js

@@ -15,7 +15,7 @@ import createAnimatedComponent from '../createAnimatedComponent';
 import * as React from 'react';
 
 // $FlowFixMe[incompatible-type]
-export default (createAnimatedComponent(SectionList): component<
+export default createAnimatedComponent(SectionList) as $FlowFixMe as component<
   // $FlowExpectedError[unclear-type]
   ItemT = any,
   // $FlowExpectedError[unclear-type]
@@ -23,4 +23,4 @@ export default (createAnimatedComponent(SectionList): component<
 >(
   ref?: React.RefSetter<SectionList<ItemT, SectionT>>,
   ...props: AnimatedProps<SectionListProps<ItemT, SectionT>>
-));
+);

packages/react-native/Libraries/Animated/components/AnimatedText.js

@@ -14,6 +14,10 @@ import Text, {type TextProps} from '../../Text/Text';
 import createAnimatedComponent from '../createAnimatedComponent';
 import * as React from 'react';
 
-export default (createAnimatedComponent(
-  (Text: $FlowFixMe),
-): AnimatedComponentType<TextProps, React.ElementRef<typeof Text>>);
+export default (createAnimatedComponent<
+  $FlowFixMe,
+  React.ElementRef<typeof Text>,
+>((Text: $FlowFixMe)): AnimatedComponentType<
+  TextProps,
+  React.ElementRef<typeof Text>,
+>);

packages/react-native/Libraries/Animated/components/AnimatedView.js

@@ -15,7 +15,8 @@ import View from '../../Components/View/View';
 import createAnimatedComponent from '../createAnimatedComponent';
 import * as React from 'react';
 
-export default (createAnimatedComponent(View): AnimatedComponentType<
+// $FlowFixMe[incompatible-type]
+export default createAnimatedComponent(View) as AnimatedComponentType<
   ViewProps,
   React.ElementRef<typeof View>,
->);
+>;

packages/react-native/Libraries/Animated/createAnimatedComponent.js

@@ -63,17 +63,29 @@ type PassThroughProps = $ReadOnly<{
   passthroughAnimatedPropExplicitValues?: ViewProps | null,
 }>;
 
-export type AnimatedProps<Props: {...}> = {
-  [K in keyof Props]: K extends NonAnimatedProps
-    ? Props[K]
-    : WithAnimatedValue<Props[K]>,
-} & PassThroughProps;
+type LooseOmit<O: interface {}, K: $Keys<$FlowFixMe>> = Pick<
+  O,
+  Exclude<$Keys<O>, K>,
+>;
 
-export type AnimatedBaseProps<Props: {...}> = {
-  [K in keyof Props]: K extends NonAnimatedProps
-    ? Props[K]
-    : WithAnimatedValue<Props[K]>,
-};
+export type AnimatedProps<Props: {...}> = LooseOmit<
+  {
+    [K in keyof Props]: K extends NonAnimatedProps
+      ? Props[K]
+      : WithAnimatedValue<Props[K]>,
+  },
+  'ref',
+> &
+  PassThroughProps;
+
+export type AnimatedBaseProps<Props: {...}> = LooseOmit<
+  {
+    [K in keyof Props]: K extends NonAnimatedProps
+      ? Props[K]
+      : WithAnimatedValue<Props[K]>,
+  },
+  'ref',
+>;
 
 export type AnimatedComponentType<Props: {...}, +Instance = mixed> = component(
   ref?: React.RefSetter<Instance>,

packages/react-native/Libraries/Animated/nodes/AnimatedValue.js

@@ -18,7 +18,6 @@ import type {AnimatedNodeConfig} from './AnimatedNode';
 import type AnimatedTracking from './AnimatedTracking';
 
 import NativeAnimatedHelper from '../../../src/private/animated/NativeAnimatedHelper';
-import InteractionManager from '../../Interaction/InteractionManager';
 import AnimatedInterpolation from './AnimatedInterpolation';
 import AnimatedWithChildren from './AnimatedWithChildren';
 
@@ -312,10 +311,6 @@ export default class AnimatedValue extends AnimatedWithChildren {
    * See https://reactnative.dev/docs/animatedvalue#animate
    */
   animate(animation: Animation, callback: ?EndCallback): void {
-    let handle = null;
-    if (animation.__isInteraction) {
-      handle = InteractionManager.createInteractionHandle();
-    }
     const previousAnimation = this._animation;
     this._animation && this._animation.stop();
     this._animation = animation;
@@ -328,9 +323,6 @@ export default class AnimatedValue extends AnimatedWithChildren {
       },
       result => {
         this._animation = null;
-        if (handle !== null) {
-          InteractionManager.clearInteractionHandle(handle);
-        }
         callback && callback(result);
       },
       previousAnimation,

packages/react-native/Libraries/AppDelegate/RCTAppDelegate.h

@@ -5,8 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTBridgeDelegate.h>
-#import <React/RCTConvert.h>
 #import <UIKit/UIKit.h>
 #import "RCTDefaultReactNativeFactoryDelegate.h"
 #import "RCTReactNativeFactory.h"

packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm

@@ -6,6 +6,7 @@
  */
 
 #import "RCTAppDelegate.h"
+#import <React/RCTBridgeDelegate.h>
 #import <React/RCTLog.h>
 #import <React/RCTRootView.h>
 #import <React/RCTSurfacePresenterBridgeAdapter.h>