xplat/js/react-native-github/packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTaskTest.kt

Reviewed By: ianlevesque

Differential Revision: D84801340

.flowconfig

@@ -69,7 +69,7 @@ munge_underscores=true
 module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/packages/react-native/index.js'
 module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/packages/react-native/\1'
 module.name_mapper='^@react-native/dev-middleware$' -> '<PROJECT_ROOT>/packages/dev-middleware'
-module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\|xml\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'
+module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\|xml\|ktx\)$' -> '<PROJECT_ROOT>/packages/react-native/Libraries/Image/RelativeImageStub'
 
 module.system.haste.module_ref_prefix=m#
 
@@ -98,4 +98,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.281.0
+^0.288.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/workflows/test-all.yml

@@ -383,8 +383,7 @@ jobs:
     runs-on: 8-core-ubuntu
     needs: [set_release_type]
     container:
-      # Version is pinned to v18.0 to unblock `run_fantom_tests` - see https://github.com/react-native-community/docker-android/pull/242#issuecomment-3280029122
-      image: reactnativecommunity/react-native-android:v18.0
+      image: reactnativecommunity/react-native-android:latest
       env:
         TERM: "dumb"
         GRADLE_OPTS: "-Dorg.gradle.daemon=false"

.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,62 +1,6 @@
 # Changelog
 
-## 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
+## v0.82.0
 
 ### Breaking
 
@@ -64,8 +8,10 @@
 - **`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))
+- **InteractionManager:** InteractionManager has been deprecated and no longer respects interaction handles. Instead, it is now recommended to avoid executing long-running JavaScript tasks by breaking them up into smaller tasks and scheduling them using `requestIdleCallback()`. ([03d9f34a82](https://github.com/facebook/react-native/commit/03d9f34a8252456d389d9f9a3bd04b99a2828c16) by [@yungsters](https://github.com/yungsters))
 - **`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
 
@@ -80,12 +26,13 @@
 
 ### Added
 
-- **Animated:** `Animated.CompositeAnomation` 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:** `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))
+- **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))
 - **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))
 
@@ -95,18 +42,23 @@
 - **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))
+- **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))
 - **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))
+- **Fabric:** Add invalidation callback for non-recycled component instances ([dc4a6d2c7e](https://github.com/facebook/react-native/commit/dc4a6d2c7e2ed421b61929896f60b1a864a60d97) by [@kkafar](https://github.com/kkafar))
+- **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))
 - **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))
+- **New Architecture:** Crash the app if they force the legacy architecture. ([dc132a4fd4](https://github.com/facebook/react-native/commit/dc132a4fd4ca8dc28dc7dbb2406ac67dac1a0ee7) 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))
+- **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))
 - **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))
@@ -117,7 +69,7 @@
 
 - **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 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))
@@ -140,6 +92,7 @@
 
 ### Deprecated
 
+- **APIs:** Deprecate legacy javascript react native apis ([e7aeea26bd](https://github.com/facebook/react-native/commit/e7aeea26bde6e9cda0a3a0a55fc2a0421fb0c0e5) by [@RSNara](https://github.com/RSNara))
 - **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))
 
@@ -193,6 +146,7 @@
 - **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))
+- **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))
 - **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))
@@ -204,11 +158,13 @@
 #### 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))
+- **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))
 - **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))
+- **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))
 - **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))
@@ -221,13 +177,18 @@
 - **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))
+- **Codegen:** Fix regression that skips artifacts code generation ([f6f5ea0b2e](https://github.com/facebook/react-native/commit/f6f5ea0b2eed894725d8f6e8bd045c99c3182026) by [@kitten](https://github.com/kitten))
 - **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))
+- **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))
+- **RCTAlertController:** Simplify RCTAlertController, don't create additional UIWindow ([05c4321b19](https://github.com/facebook/react-native/commit/05c4321b194c3d0e146b6085bcaccc75acd3fd67) by [@okwasniewski](https://github.com/okwasniewski))
 - **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))
+- **Switch:** Fix Switch layout to work with iOS26 ([91d427fe52](https://github.com/facebook/react-native/commit/91d427fe52a307f9aa8579912ef956d61808dad2) 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))
@@ -237,6 +198,39 @@
 
 - **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.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.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.81.1
 
 ### Added
@@ -251,7 +245,6 @@
 - **Infra:** Add missing Babel dependencies ([bf2c3af93b](https://github.com/facebook/react-native/commit/bf2c3af93b146943cb35866fa9badcd188e63f5b) by [@tido64](https://github.com/tido64))
 - **Accessibility:** fix `aria-label` on `TextInput` ([6965d57e75](https://github.com/facebook/react-native/commit/6965d57e75ed0cf9f265c6020d478ddb9af4bf10) by [@mdjastrzebski](https://github.com/mdjastrzebski))
 
-
 #### iOS specific
 
 - **TextInput:** Setting maxLength to 0 in TextInput now correctly blocks typing ([c5956da8c0](https://github.com/facebook/react-native/commit/c5956da8c0b735d47761af51019ed25b49001c00) by [@riteshshukla04](https://github.com/riteshshukla04))
@@ -265,7 +258,6 @@
 - **Prebuild:** Fix "file exists" error in `ReactNativeDependencies.podspec` ([4c570b5d31](https://github.com/facebook/react-native/commit/4c570b5d31ef46e04e5fa26fa92d7f7090bf15e2) by [@vonovak](https://github.com/vonovak))
 - **Prebuild:** added explicit handling of ReactCodegen ([6526a98d68](https://github.com/facebook/react-native/commit/6526a98d68dbc8578ea15cbf117c0a216c6e9af0) by [@cipolleschi](https://github.com/cipolleschi))
 
-
 ## v0.81.0
 
 ### Breaking

build.gradle.kts

@@ -128,7 +128,7 @@ if (project.findProperty("react.internal.useHermesNightly")?.toString()?.toBoole
 
       That's fine for local development, but you should not commit this change.
       ********************************************************************************
-  """
+      """
           .trimIndent()
   )
   allprojects {

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/electron-store_v8.x.x.js

@@ -1,41 +0,0 @@
-/**
- * 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
- */
-
-declare module 'electron-store' {
-  declare export type Schema = any;
-
-  declare export type Options = {
-    +name?: string,
-    defaults?: Object,
-    schema?: any,
-    migrations?: any,
-    beforeEachMigration?: any,
-    clearInvalidConfig?: boolean,
-    serialize?: any,
-    deserialize?: any,
-    accessPropertiesByDotNotation?: boolean,
-    watch?: boolean,
-    encryptionKey?: string | Buffer | $ReadOnlyArray<number>,
-    ...
-  };
-
-  declare class ElectronStore {
-    constructor(options?: Options): this;
-    get(key: string): any;
-    get(key: string, defaultValue: any): any;
-    set(key: string, value: any): void;
-    set(object: Object): void;
-    has(key: string): boolean;
-    delete(key: string): void;
-    clear(): void;
-  }
-
-  declare module.exports: Class<ElectronStore>;
-}

gradle.properties

@@ -4,6 +4,13 @@ org.gradle.caching=true
 
 android.useAndroidX=true
 
+# Those 2 properties are needed to make our project compatible with
+# AGP 9.0.0 for the time being. Ideally we should not opt-out of
+# builtInKotlin and newDsl once AGP 9.0.0 hits stable.
+# More on this: https://developer.android.com/build/releases/agp-preview#android-gradle-plugin-built-in-kotlin
+android.builtInKotlin=false
+android.newDsl=false
+
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
 # ./gradlew <task> -PreactNativeArchitectures=x86_64

package.json

@@ -58,8 +58,8 @@
     "@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",
+    "@react-native/metro-babel-transformer": "0.83.0-main",
+    "@react-native/metro-config": "0.83.0-main",
     "@tsconfig/node22": "22.0.2",
     "@types/react": "^19.1.0",
     "@typescript-eslint/parser": "^8.36.0",
@@ -86,7 +86,7 @@
     "eslint-plugin-relay": "^1.8.3",
     "fb-dotslash": "0.5.8",
     "flow-api-translator": "0.32.0",
-    "flow-bin": "^0.281.0",
+    "flow-bin": "^0.288.0",
     "glob": "^7.1.1",
     "hermes-eslint": "0.32.0",
     "hermes-transform": "0.32.0",
@@ -101,15 +101,15 @@
     "markdownlint-cli2": "^0.17.2",
     "markdownlint-rule-relative-links": "^3.0.0",
     "memfs": "^4.38.2",
-    "metro-babel-register": "^0.83.1",
-    "metro-transform-plugins": "^0.83.1",
+    "metro-babel-register": "^0.83.3",
+    "metro-transform-plugins": "^0.83.3",
     "micromatch": "^4.0.4",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
     "prettier": "3.6.2",
     "prettier-plugin-hermes-parser": "0.32.0",
-    "react": "19.1.1",
-    "react-test-renderer": "19.1.1",
+    "react": "19.2.0",
+    "react-test-renderer": "19.2.0",
     "rimraf": "^3.0.2",
     "shelljs": "^0.8.5",
     "signedsource": "^2.0.0",
@@ -121,7 +121,7 @@
   },
   "resolutions": {
     "eslint-plugin-react-hooks": "6.1.0-canary-12bc60f5-20250613",
-    "react-is": "19.1.1",
+    "react-is": "19.2.0",
     "on-headers": "1.1.0",
     "compression": "1.8.1"
   }

packages/assets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/assets-registry",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "Asset support code for React Native.",
   "license": "MIT",
   "repository": {

packages/babel-plugin-codegen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/babel-plugin-codegen",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "Babel plugin to generate native module and view manager code for React Native.",
   "license": "MIT",
   "repository": {
@@ -26,7 +26,7 @@
   ],
   "dependencies": {
     "@babel/traverse": "^7.25.3",
-    "@react-native/codegen": "0.82.0-main"
+    "@react-native/codegen": "0.83.0-main"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2"

packages/community-cli-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/community-cli-plugin",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "Core CLI commands for React Native",
   "keywords": [
     "react-native",
@@ -22,16 +22,16 @@
     "dist"
   ],
   "dependencies": {
-    "@react-native/dev-middleware": "0.82.0-main",
+    "@react-native/dev-middleware": "0.83.0-main",
     "debug": "^4.4.0",
     "invariant": "^2.2.4",
-    "metro": "^0.83.1",
-    "metro-config": "^0.83.1",
-    "metro-core": "^0.83.1",
+    "metro": "^0.83.3",
+    "metro-config": "^0.83.3",
+    "metro-core": "^0.83.3",
     "semver": "^7.1.3"
   },
   "devDependencies": {
-    "metro-resolver": "^0.83.1"
+    "metro-resolver": "^0.83.3"
   },
   "peerDependencies": {
     "@react-native-community/cli": "*",

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/core-cli-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/core-cli-utils",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "React Native CLI library for Frameworks to build on",
   "license": "MIT",
   "main": "./src/index.flow.js",

packages/debugger-frontend/BUILD_INFO

@@ -1,5 +1,5 @@
-@generated SignedSource<<0b54f75686e4893a5444839bf621a317>>
-Git revision: 5a792db1225adda206313e9bf751198a1ca7851a
+@generated SignedSource<<ec85a720cb9603510d40915ba1410b50>>
+Git revision: 54afd8765db32a9640edef3788085b991fe4b88a
 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/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-frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/debugger-frontend",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "Debugger frontend for React Native based on Chrome DevTools",
   "keywords": [
     "react-native",

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

@@ -1,71 +1,71 @@
 #!/usr/bin/env dotslash
 
-// @generated SignedSource<<9df662721aea6e3774a8677e2a6065e4>>
+// @generated SignedSource<<8b06371489dc8b79c23cbf095568c91a>>
 
 
 {
     "name": "React Native DevTools",
     "platforms": {
         "linux-aarch64": {
-            "size": 116056584,
+            "size": 116051181,
             "hash": "sha256",
-            "digest": "fac3912f10e3c373c874be6c4696f11e05cbaa754c116db6ea72189afae5efe6",
+            "digest": "a6060e1291f9ee7e9feecd511012c041ed2a65c6df6f8ab5aca4d96adbbc9921",
             "providers": [
                 {
                     "type": "http",
-                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQPdlYV_w4y_wxd5Rs8c_F-soLMbY1zwXJjD-JM4TkOtOELyxZGyreTb6dTehp_X6e3qVFZUT05ETRs0MbvqYr4mqdb6dkG9DqNQEVv3TBoHwl7TYSygtHJEs3gXTAtMLYEKW9xXODJlVF-9II7fdTdHU7x7Pyf6NR6S3nv7sKUVD-zKpxF50L2TwUQ"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQOD3-UmqD25MctpnB7Ogj0A8nHDs-SgFnMNFfStIxOajFAFSN93zuoWsLD3ylc3wVuX6-L-ndcMftTd7tlR1ZZWYy4a7g78w4N1UTzIT_z9vdOXpYGe7fZrHXiBHJu0QexD0b54OcdDSEFhh0-7puUTGPnIg3pHhThiU6bf_5AqvGIEYA5FGjih3zY"
                 }
             ],
             "format": "tar.gz",
             "path": "React Native DevTools-linux-arm64/React Native DevTools"
         },
         "linux-x86_64": {
-            "size": 115929093,
+            "size": 115927343,
             "hash": "sha256",
-            "digest": "06bbaeb62ae2e0081d184eba42b9f15be0d0b3f4901142b08a8a1430ff83e722",
+            "digest": "354f6550617d0c6b4bb4478ad085d4efe3671ba9a1b78d90d9bfc003a523cb6d",
             "providers": [
                 {
                     "type": "http",
-                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQPENbrxrg0RF_TiyxSY_YVYqC1UfRKj_bMfKb3qHUsIhBlya8n3FkbfJqTXTNdqL4riFRulXS5ecXZprtvk_9kao-zY59r3kiTRwobzF0jnjM507_9UOnEHWzG5ZJYzQyOtS3kQmT0HwZabVj9qw38OB9mk-MPVCZIPZay2PRnIThBzpKDoOOP9"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQMVMfCfSykWSI8mB5koUEUtx819xGQGW3Tm1DBpEmjWA_g8C4PoPPDCIPpgJmB5nUKrv081_dtayoArCncyFJVs0ofbxGn0EkaEW2vW3OJ2J0XMH58v5cTLED3dT8TmWwAg6aYUTr0ch8DfVXRxsibYUIWaxJUwOJ-urR-iQm7YPQUboLElaJbM"
                 }
             ],
             "format": "tar.gz",
             "path": "React Native DevTools-linux-x64/React Native DevTools"
         },
         "macos-aarch64": {
-            "size": 110891603,
+            "size": 110891048,
             "hash": "sha256",
-            "digest": "eeb9cc1399c0c38c429848dbf622f1b46e88d7d97788dcdc4c30a9fcce37705c",
+            "digest": "df41cfce9bc977ef4fdc66c3c892c0eedee5b07aa618550308157c51b8e75561",
             "providers": [
                 {
                     "type": "http",
-                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQN9bd7nbXi-uF_MooJEiUL2jJVifMqgQxZ236aqbSdiJe5Uzjud5ANf0LDAl8GDVVRShd6x4B-gsZ-qRowH0qJikoGatQIkBgyzp4i8ors52etGOIIwdAxdNIng5Vtp441j2_N__btkJqlHcMMbbqvO8fg9oeYTlhMpOx3MLLWXIlG7ix5IFUDiYChf"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQOGfzOOV_mwg63orI4Hv0VQKQtE5Vk60eSl55gZDd0djjU-lmqddRZm_LxsWsek4xM7qIxqCbw6wGx7zqnrlmQGyfD98n0TBFh3uhVeYP_j3r2UkKci6tqjEqcLTHjFj3agjI6jDEe3fDpZtwKY4UMhXdVP4o1goYq13rG-IQAqIsAm04MnPFOYyp5X"
                 }
             ],
             "format": "tar.gz",
             "path": "React Native DevTools.app/Contents/MacOS/React Native DevTools"
         },
         "macos-x86_64": {
-            "size": 117770388,
+            "size": 117777930,
             "hash": "sha256",
-            "digest": "a65e446e526502b267cbe6800ae031e4e1b5b0aca21412152a66ffe1d3a29410",
+            "digest": "96805c51623a163b1d94b501e2e091f403b4c3575063bd7363f8e1550cda8dc5",
             "providers": [
                 {
                     "type": "http",
-                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQN29ukKLZS48QcCU-gms06YFnG-fxxDfrWTup-Z6KoIAP-QEu3sFzrpqeZz4g-jFsh3o-IIoHJsdbu4a2U7ROjPfWGguGJrPK8fdc3iV67Qw1_VAPU13dm0dI1DbSY50ah05wh43jdBG3LGCAYYJ-W8_mZMC3HqM2v-8KVd-DoPT4hOh1s9CCFgEQ"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQNbF-vba13QuctGdSckSWSApEqUne0w8vGceEm5u9VNYqHzwaZu6_T0n12Ml7aHuNgAgU0OOxJKUjcr2DVsNEsjcCYwMqCjZys8yF8NfM39OH1YePjHZCw5jinydbhGxhF1zbJ_zKmuOx1FhJtzCD3CUbLSea7fuhPh6ytLUIu3Ctx4aFQLFtbJZQ"
                 }
             ],
             "format": "tar.gz",
             "path": "React Native DevTools.app/Contents/MacOS/React Native DevTools"
         },
         "windows-x86_64": {
-            "size": 125526370,
+            "size": 125533589,
             "hash": "sha256",
-            "digest": "26b190c0f85249dee91999e020b8fe7ffd5c007458a2103ed3822558861dbe87",
+            "digest": "7f560e6d68b4b917c53ba0518a778a20e267cce55474ad972d345b2738746a52",
             "providers": [
                 {
                     "type": "http",
-                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQO0mdIJx1eYiSDJNiAZ2soaeECILayWnvOeiey-fpS4ydDTreAMfwL4QZ5GZo4-AsGwOXCSdF3hBMM2ufnvw6BDFg5UEiTc4DALJu7o6YBBG4wlVZbI-2kkaXd7u8RhBQPjmhsdcX3sDmCGmSr3WK9EkTRKStE2lb6ilOn-969h4dYWekwUUCSX"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQPZzccNNBkp1OKt_SPZ-iDoK5LDWyvZhFMgz4oTf9Ja9PlKU7i_5ydAVd714waJteCM1cdAidPN6PumBRs1uK12E9moytEskWXlMPbQObFpaTnkxLn6xp3N5EAKbAXvPfecX41Tz_7HRqh19_hW3XpwXF-VNsAdtn59ApMtX1fpN0peB1l4o57P"
                 }
             ],
             "format": "tar.gz",

packages/debugger-shell/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-native/debugger-shell",
   "productName": "React Native DevTools",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "Experimental debugger shell for React Native for use with @react-native/debugger-frontend",
   "keywords": [
     "react-native",
@@ -35,7 +35,6 @@
   },
   "devDependencies": {
     "electron": "37.2.6",
-    "electron-store": "^8.2.0",
     "semver": "^7.1.3"
   },
   "files": [

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

@@ -8,13 +8,15 @@
  * @format
  */
 
-// $FlowFixMe[unclear-type] We have no Flow types for the Electron API.
-const {BrowserWindow, Menu, app, shell, ipcMain} = require('electron') as any;
-const Store = require('electron-store');
+import SettingsStore from './SettingsStore.js';
+
 const path = require('path');
 const util = require('util');
 
-const appSettings = new Store();
+// $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<{

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

@@ -25,7 +25,9 @@ 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,
 });

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,10 +158,14 @@ async function unstable_prepareDebuggerShell(
 
 function getShellBinaryAndArgs(
   flavor: DebuggerShellFlavor,
+  prebuiltBinaryPath: ?string,
 ): [string, Array<string>] {
   switch (flavor) {
     case 'prebuilt':
-      return [require('fb-dotslash'), [DEVTOOLS_BINARY_DOTSLASH_FILE]];
+      return [
+        require('fb-dotslash'),
+        [prebuiltBinaryPath ?? DEVTOOLS_BINARY_DOTSLASH_FILE],
+      ];
     case 'dev':
       return [
         // NOTE: Internally at Meta, this is aliased to a workspace that is

packages/dev-middleware/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/dev-middleware",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "Dev server middleware for React Native",
   "keywords": [
     "react-native",
@@ -23,8 +23,8 @@
   ],
   "dependencies": {
     "@isaacs/ttlcache": "^1.4.1",
-    "@react-native/debugger-frontend": "0.82.0-main",
-    "@react-native/debugger-shell": "0.82.0-main",
+    "@react-native/debugger-frontend": "0.83.0-main",
+    "@react-native/debugger-shell": "0.83.0-main",
     "chrome-launcher": "^0.15.2",
     "chromium-edge-launcher": "^0.2.0",
     "connect": "^3.6.5",
@@ -39,7 +39,7 @@
     "node": ">= 20.19.4"
   },
   "devDependencies": {
-    "@react-native/debugger-shell": "0.82.0-main",
+    "@react-native/debugger-shell": "0.83.0-main",
     "selfsigned": "^2.4.1",
     "undici": "^5.29.0",
     "wait-for-expect": "^3.0.2"

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/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/eslint-config-react-native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/eslint-config",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "ESLint config for React Native",
   "license": "MIT",
   "repository": {
@@ -22,7 +22,7 @@
   "dependencies": {
     "@babel/core": "^7.25.2",
     "@babel/eslint-parser": "^7.25.1",
-    "@react-native/eslint-plugin": "0.82.0-main",
+    "@react-native/eslint-plugin": "0.83.0-main",
     "@typescript-eslint/eslint-plugin": "^8.36.0",
     "@typescript-eslint/parser": "^8.36.0",
     "eslint-config-prettier": "^8.5.0",

packages/eslint-plugin-react-native/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/eslint-plugin",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "ESLint rules for @react-native/eslint-config",
   "license": "MIT",
   "repository": {

packages/eslint-plugin-specs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/eslint-plugin-specs",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "ESLint rules to validate NativeModule and Component Specs",
   "license": "MIT",
   "repository": {
@@ -26,7 +26,7 @@
   "dependencies": {
     "@babel/core": "^7.25.2",
     "@babel/plugin-transform-flow-strip-types": "^7.25.2",
-    "@react-native/codegen": "0.82.0-main",
+    "@react-native/codegen": "0.83.0-main",
     "make-dir": "^2.1.0",
     "pirates": "^4.0.1",
     "source-map-support": "0.5.0"

packages/gradle-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/gradle-plugin",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "Gradle Plugin for React Native",
   "license": "MIT",
   "repository": {

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/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/AgpConfiguratorUtils.kt

@@ -100,6 +100,7 @@ internal object AgpConfiguratorUtils {
           project.extensions
               .getByType(ApplicationAndroidComponentsExtension::class.java)
               .finalizeDsl { ext ->
+                ext.buildFeatures.resValues = true
                 ext.defaultConfig.resValue(
                     "string",
                     "react_native_dev_server_ip",

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

@@ -191,6 +191,14 @@ internal object DependencyUtils {
               "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
   }

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()
   )
@@ -242,7 +242,7 @@ internal fun readPackageJsonFile(
   return packageJson?.let { JsonUtils.fromPackageJson(it) }
 }
 
-private const val HERMES_COMPILER_NPM_DIR = "node_modules/hermes-compiler/%OS-BIN%/"
+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/test/kotlin/com/facebook/react/tasks/GenerateAutolinkingNewArchitecturesFileTaskTest.kt

@@ -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

@@ -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/PreparePrefabHeadersTaskTest.kt

@@ -34,9 +34,9 @@ class PreparePrefabHeadersTaskTest {
 
     val project = createProject(projectDir = tempFolder.root)
     val task =
-        createTestTask<PreparePrefabHeadersTask>(project = project) {
-          it.outputDir.set(outputDir)
-          it.input.set(listOf(PrefabPreprocessingEntry("sample_library", "input/" to "")))
+        createTestTask<PreparePrefabHeadersTask>(project = project) { prefabTask ->
+          prefabTask.outputDir.set(outputDir)
+          prefabTask.input.set(listOf(PrefabPreprocessingEntry("sample_library", "input/" to "")))
         }
 
     task.taskAction()
@@ -52,9 +52,9 @@ class PreparePrefabHeadersTaskTest {
 
     val project = createProject(projectDir = tempFolder.root)
     val task =
-        createTestTask<PreparePrefabHeadersTask>(project = project) {
-          it.outputDir.set(outputDir)
-          it.input.set(
+        createTestTask<PreparePrefabHeadersTask>(project = project) { headerTask ->
+          headerTask.outputDir.set(outputDir)
+          headerTask.input.set(
               listOf(PrefabPreprocessingEntry("sample_library", "input/" to expectedPrefix))
           )
         }
@@ -74,9 +74,9 @@ class PreparePrefabHeadersTaskTest {
 
     val project = createProject(projectDir = tempFolder.root)
     val task =
-        createTestTask<PreparePrefabHeadersTask>(project = project) {
-          it.outputDir.set(outputDir)
-          it.input.set(
+        createTestTask<PreparePrefabHeadersTask>(project = project) { ignoreFilesTask ->
+          ignoreFilesTask.outputDir.set(outputDir)
+          ignoreFilesTask.input.set(
               listOf(PrefabPreprocessingEntry("sample_library", "input/" to expectedPrefix))
           )
         }
@@ -96,9 +96,9 @@ class PreparePrefabHeadersTaskTest {
 
     val project = createProject(projectDir = tempFolder.root)
     val task =
-        createTestTask<PreparePrefabHeadersTask>(project = project) {
-          it.outputDir.set(outputDir)
-          it.input.set(
+        createTestTask<PreparePrefabHeadersTask>(project = project) { multiPathTask ->
+          multiPathTask.outputDir.set(outputDir)
+          multiPathTask.input.set(
               listOf(
                   PrefabPreprocessingEntry(
                       "sample_library",
@@ -122,9 +122,9 @@ class PreparePrefabHeadersTaskTest {
 
     val project = createProject(projectDir = tempFolder.root)
     val task =
-        createTestTask<PreparePrefabHeadersTask>(project = project) {
-          it.outputDir.set(outputDir)
-          it.input.set(
+        createTestTask<PreparePrefabHeadersTask>(project = project) { multiEntryTask ->
+          multiEntryTask.outputDir.set(outputDir)
+          multiEntryTask.input.set(
               listOf(
                   PrefabPreprocessingEntry("libraryone", "input/lib1/" to ""),
                   PrefabPreprocessingEntry("librarytwo", "input/lib2/" to ""),
@@ -147,9 +147,9 @@ class PreparePrefabHeadersTaskTest {
 
     val project = createProject(projectDir = tempFolder.root)
     val task =
-        createTestTask<PreparePrefabHeadersTask>(project = project) {
-          it.outputDir.set(outputDir)
-          it.input.set(
+        createTestTask<PreparePrefabHeadersTask>(project = project) { sharedHeaderTask ->
+          sharedHeaderTask.outputDir.set(outputDir)
+          sharedHeaderTask.input.set(
               listOf(
                   PrefabPreprocessingEntry(
                       "libraryone",

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

@@ -549,9 +549,9 @@ class DependencyUtilsTest {
         tempFolder.newFile("gradle.properties").apply {
           writeText(
               """
-        VERSION_NAME=1000.0.0
-        ANOTHER_PROPERTY=true
-      """
+              VERSION_NAME=1000.0.0
+              ANOTHER_PROPERTY=true
+              """
                   .trimIndent()
           )
         }
@@ -560,9 +560,9 @@ class DependencyUtilsTest {
         tempFolder.newFile("version.properties").apply {
           writeText(
               """
-        HERMES_V1_VERSION_NAME=1000.0.0
-        ANOTHER_PROPERTY=true
-      """
+              HERMES_V1_VERSION_NAME=1000.0.0
+              ANOTHER_PROPERTY=true
+              """
                   .trimIndent()
           )
         }
@@ -583,11 +583,11 @@ class DependencyUtilsTest {
         tempFolder.newFile("gradle.properties").apply {
           writeText(
               """
-        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
-      """
+              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()
           )
         }
@@ -596,9 +596,9 @@ class DependencyUtilsTest {
         tempFolder.newFile("version.properties").apply {
           writeText(
               """
-        HERMES_V1_VERSION_NAME=250829098.0.0-stable
-        ANOTHER_PROPERTY=true
-      """
+              HERMES_V1_VERSION_NAME=250829098.0.0-stable
+              ANOTHER_PROPERTY=true
+              """
                   .trimIndent()
           )
         }
@@ -619,8 +619,8 @@ class DependencyUtilsTest {
         tempFolder.newFile("gradle.properties").apply {
           writeText(
               """
-        ANOTHER_PROPERTY=true
-      """
+              ANOTHER_PROPERTY=true
+              """
                   .trimIndent()
           )
         }
@@ -629,8 +629,8 @@ class DependencyUtilsTest {
         tempFolder.newFile("version.properties").apply {
           writeText(
               """
-        ANOTHER_PROPERTY=true
-      """
+              ANOTHER_PROPERTY=true
+              """
                   .trimIndent()
           )
         }
@@ -650,9 +650,9 @@ class DependencyUtilsTest {
         tempFolder.newFile("gradle.properties").apply {
           writeText(
               """
-        VERSION_NAME=
-        ANOTHER_PROPERTY=true
-      """
+              VERSION_NAME=
+              ANOTHER_PROPERTY=true
+              """
                   .trimIndent()
           )
         }
@@ -661,9 +661,9 @@ class DependencyUtilsTest {
         tempFolder.newFile("version.properties").apply {
           writeText(
               """
-        HERMES_V1_VERSION_NAME=
-        ANOTHER_PROPERTY=true
-      """
+              HERMES_V1_VERSION_NAME=
+              ANOTHER_PROPERTY=true
+              """
                   .trimIndent()
           )
         }
@@ -683,10 +683,10 @@ class DependencyUtilsTest {
         tempFolder.newFile("gradle.properties").apply {
           writeText(
               """
-        react.internal.publishingGroup=io.github.test
-        react.internal.hermesPublishingGroup=io.github.test
-        ANOTHER_PROPERTY=true
-      """
+              react.internal.publishingGroup=io.github.test
+              react.internal.hermesPublishingGroup=io.github.test
+              ANOTHER_PROPERTY=true
+              """
                   .trimIndent()
           )
         }
@@ -695,9 +695,9 @@ class DependencyUtilsTest {
         tempFolder.newFile("version.properties").apply {
           writeText(
               """
-        HERMES_V1_VERSION_NAME=
-        ANOTHER_PROPERTY=true
-      """
+              HERMES_V1_VERSION_NAME=
+              ANOTHER_PROPERTY=true
+              """
                   .trimIndent()
           )
         }
@@ -716,8 +716,8 @@ class DependencyUtilsTest {
         tempFolder.newFile("gradle.properties").apply {
           writeText(
               """
-        ANOTHER_PROPERTY=true
-      """
+              ANOTHER_PROPERTY=true
+              """
                   .trimIndent()
           )
         }
@@ -726,9 +726,9 @@ class DependencyUtilsTest {
         tempFolder.newFile("version.properties").apply {
           writeText(
               """
-        HERMES_V1_VERSION_NAME=
-        ANOTHER_PROPERTY=true
-      """
+              HERMES_V1_VERSION_NAME=
+              ANOTHER_PROPERTY=true
+              """
                   .trimIndent()
           )
         }

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

@@ -165,8 +165,8 @@ class PathUtilsTest {
   @Test
   @WithOs(OS.MAC)
   fun detectOSAwareHermesCommand_withHermesV1Enabled() {
-    tempFolder.newFolder("node_modules/hermes-compiler/osx-bin/")
-    val expected = tempFolder.newFile("node_modules/hermes-compiler/osx-bin/hermesc")
+    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())
@@ -320,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

@@ -150,11 +150,11 @@ class ProjectUtilsTest {
       writeText(
           // language=json
           """
-      {
-        "name": "a-library",
-        "codegenConfig": {}
-      }
-      """
+          {
+            "name": "a-library",
+            "codegenConfig": {}
+          }
+          """
               .trimIndent()
       )
     }
@@ -170,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/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/metro-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/metro-config",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "Metro configuration for React Native.",
   "license": "MIT",
   "repository": {
@@ -26,9 +26,9 @@
     "dist"
   ],
   "dependencies": {
-    "@react-native/js-polyfills": "0.82.0-main",
-    "@react-native/metro-babel-transformer": "0.82.0-main",
-    "metro-config": "^0.83.1",
-    "metro-runtime": "^0.83.1"
+    "@react-native/js-polyfills": "0.83.0-main",
+    "@react-native/metro-babel-transformer": "0.83.0-main",
+    "metro-config": "^0.83.3",
+    "metro-runtime": "^0.83.3"
   }
 }

packages/new-app-screen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/new-app-screen",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "NewAppScreen component for React Native",
   "keywords": [
     "react-native"

packages/normalize-color/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/normalize-colors",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "Color normalization for React Native.",
   "license": "MIT",
   "repository": {

packages/polyfills/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/js-polyfills",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "Polyfills for React Native.",
   "license": "MIT",
   "repository": {

packages/react-native-babel-preset/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/babel-preset",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "Babel preset for React Native applications",
   "repository": {
     "type": "git",
@@ -66,7 +66,7 @@
     "@babel/plugin-transform-typescript": "^7.25.2",
     "@babel/plugin-transform-unicode-regex": "^7.24.7",
     "@babel/template": "^7.25.0",
-    "@react-native/babel-plugin-codegen": "0.82.0-main",
+    "@react-native/babel-plugin-codegen": "0.83.0-main",
     "babel-plugin-syntax-hermes-parser": "0.32.0",
     "babel-plugin-transform-flow-enums": "^0.0.2",
     "react-refresh": "^0.14.0"

packages/react-native-babel-preset/src/configs/main.js

@@ -20,6 +20,10 @@ const EXCLUDED_FIRST_PARTY_PATHS = [
   /[/\\]private[/\\]react-native-fantom[/\\]/,
 ];
 
+// customTransformOptions may be strings from URL params, or booleans passed
+// programatically. For strings, handle them as Metro does when parsing URLs.
+const TRUE_VALS = new Set([true, 'true', '1']);
+
 function isTypeScriptSource(fileName) {
   return !!fileName && fileName.endsWith('.ts');
 }
@@ -55,6 +59,9 @@ const getPreset = (src, options) => {
 
   const isNull = src == null;
   const hasClass = isNull || src.indexOf('class') !== -1;
+  const preserveClasses = TRUE_VALS.has(
+    options?.customTransformOptions?.unstable_preserveClasses,
+  );
 
   const extraPlugins = [];
   const firstPartyPlugins = [];
@@ -91,7 +98,7 @@ const getPreset = (src, options) => {
     );
   }
 
-  if (hasClass) {
+  if (hasClass && !preserveClasses) {
     extraPlugins.push([require('@babel/plugin-transform-classes')]);
   }
 
@@ -235,7 +242,9 @@ const getPreset = (src, options) => {
           ],
           [require('babel-plugin-transform-flow-enums')],
           [require('@babel/plugin-transform-block-scoping')],
-          [require('@babel/plugin-transform-class-properties'), {loose}],
+          ...(preserveClasses
+            ? []
+            : [[require('@babel/plugin-transform-class-properties'), {loose}]]),
           [require('@babel/plugin-transform-private-methods'), {loose}],
           [
             require('@babel/plugin-transform-private-property-in-object'),

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/metro-babel-transformer",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "Babel transformer for React Native applications.",
   "repository": {
     "type": "git",
@@ -27,7 +27,7 @@
   ],
   "dependencies": {
     "@babel/core": "^7.25.2",
-    "@react-native/babel-preset": "0.82.0-main",
+    "@react-native/babel-preset": "0.83.0-main",
     "hermes-parser": "0.32.0",
     "nullthrows": "^1.1.1"
   },

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/e2e/deep_imports/__tests__/modules/GenerateModuleCpp-test.js

@@ -1,51 +0,0 @@
-/**
- * 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
- */
-
-'use strict';
-
-import type {SchemaType} from '../../../../src/CodegenSchema';
-
-const generator = require('../../../../src/generators/modules/GenerateModuleCpp');
-const {FlowParser} = require('../../../../src/parsers/flow/parser');
-const fs = require('fs');
-
-const FIXTURE_DIR = `${__dirname}/../../__test_fixtures__/modules`;
-
-const parser = new FlowParser();
-
-function getModules(): SchemaType {
-  const filenames: Array<string> = fs.readdirSync(FIXTURE_DIR);
-  return filenames.reduce<SchemaType>(
-    (accumulator, file) => {
-      const schema = parser.parseFile(`${FIXTURE_DIR}/${file}`);
-      return {
-        modules: {
-          ...accumulator.modules,
-          ...schema.modules,
-        },
-      };
-    },
-    {modules: {}},
-  );
-}
-
-describe('GenerateModuleCpp', () => {
-  it('can generate an implementation file NativeModule specs', () => {
-    const libName = 'RNCodegenModuleFixtures';
-    const output = generator.generate(libName, getModules(), undefined, false);
-    expect(output.get(libName + 'JSI-generated.cpp')).toMatchSnapshot();
-  });
-
-  it('can generate a header file NativeModule specs with assume nonnull enabled', () => {
-    const libName = 'RNCodegenModuleFixtures';
-    const output = generator.generate(libName, getModules(), undefined, true);
-    expect(output.get(libName + 'JSI-generated.cpp')).toMatchSnapshot();
-  });
-});

packages/react-native-codegen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/codegen",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "Code generation tools for React Native",
   "license": "MIT",
   "repository": {

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/generators/RNCodegen.js

@@ -36,7 +36,6 @@ const generateTests = require('./components/GenerateTests.js');
 const generateThirdPartyFabricComponentsProviderH = require('./components/GenerateThirdPartyFabricComponentsProviderH.js');
 const generateThirdPartyFabricComponentsProviderObjCpp = require('./components/GenerateThirdPartyFabricComponentsProviderObjCpp.js');
 const generateViewConfigJs = require('./components/GenerateViewConfigJs.js');
-const generateModuleCpp = require('./modules/GenerateModuleCpp.js');
 const generateModuleH = require('./modules/GenerateModuleH.js');
 const generateModuleJavaSpec = require('./modules/GenerateModuleJavaSpec.js');
 const generateModuleJniCpp = require('./modules/GenerateModuleJniCpp.js');
@@ -56,7 +55,6 @@ const ALL_GENERATORS = {
   generateStateCpp: generateStateCpp.generate,
   generateStateH: generateStateH.generate,
   generateModuleH: generateModuleH.generate,
-  generateModuleCpp: generateModuleCpp.generate,
   generateModuleObjCpp: generateModuleObjCpp.generate,
   generateModuleJavaSpec: generateModuleJavaSpec.generate,
   generateModuleJniCpp: generateModuleJniCpp.generate,
@@ -179,7 +177,7 @@ const LIBRARY_GENERATORS: LibraryGeneratorsFunctions = {
     generateModuleJniH.generate,
     generateModuleJavaSpec.generate,
   ],
-  modulesCxx: [generateModuleCpp.generate, generateModuleH.generate],
+  modulesCxx: [generateModuleH.generate],
   modulesIOS: [generateModuleObjCpp.generate],
   tests: [generateTests.generate],
   'shadow-nodes': [

packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js

@@ -1,296 +0,0 @@
-/**
- * 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
- * @format
- */
-
-'use strict';
-
-import type {
-  NamedShape,
-  NativeModuleEnumMap,
-  NativeModuleFunctionTypeAnnotation,
-  NativeModuleParamTypeAnnotation,
-  NativeModulePropertyShape,
-  NativeModuleTypeAnnotation,
-  Nullable,
-  SchemaType,
-} from '../../CodegenSchema';
-import type {AliasResolver} from './Utils';
-
-const {unwrapNullable} = require('../../parsers/parsers-commons');
-const {createAliasResolver, getModules} = require('./Utils');
-
-type FilesOutput = Map<string, string>;
-
-const HostFunctionTemplate = ({
-  hasteModuleName,
-  methodName,
-  returnTypeAnnotation,
-  args,
-}: $ReadOnly<{
-  hasteModuleName: string,
-  methodName: string,
-  returnTypeAnnotation: Nullable<NativeModuleTypeAnnotation>,
-  args: Array<string>,
-}>) => {
-  const isNullable = returnTypeAnnotation.type === 'NullableTypeAnnotation';
-  const isVoid = returnTypeAnnotation.type === 'VoidTypeAnnotation';
-  const methodCallArgs = ['    rt', ...args].join(',\n    ');
-  const methodCall = `static_cast<${hasteModuleName}CxxSpecJSI *>(&turboModule)->${methodName}(\n${methodCallArgs}\n  )`;
-
-  return `static jsi::Value __hostFunction_${hasteModuleName}CxxSpecJSI_${methodName}(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {${
-    isVoid
-      ? `\n  ${methodCall};`
-      : isNullable
-        ? `\n  auto result = ${methodCall};`
-        : ''
-  }
-  return ${
-    isVoid
-      ? 'jsi::Value::undefined()'
-      : isNullable
-        ? 'result ? jsi::Value(std::move(*result)) : jsi::Value::null()'
-        : methodCall
-  };
-}`;
-};
-
-const ModuleTemplate = ({
-  hasteModuleName,
-  hostFunctions,
-  moduleName,
-  methods,
-}: $ReadOnly<{
-  hasteModuleName: string,
-  hostFunctions: $ReadOnlyArray<string>,
-  moduleName: string,
-  methods: $ReadOnlyArray<$ReadOnly<{methodName: string, paramCount: number}>>,
-}>) => {
-  return `${hostFunctions.join('\n')}
-
-${hasteModuleName}CxxSpecJSI::${hasteModuleName}CxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule("${moduleName}", jsInvoker) {
-${methods
-  .map(({methodName, paramCount}) => {
-    return `  methodMap_["${methodName}"] = MethodMetadata {${paramCount}, __hostFunction_${hasteModuleName}CxxSpecJSI_${methodName}};`;
-  })
-  .join('\n')}
-}`;
-};
-
-const FileTemplate = ({
-  libraryName,
-  modules,
-}: $ReadOnly<{
-  libraryName: string,
-  modules: string,
-}>) => {
-  return `/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * ${'@'}generated by codegen project: GenerateModuleCpp.js
- */
-
-#include "${libraryName}JSI.h"
-
-namespace facebook::react {
-
-${modules}
-
-
-} // namespace facebook::react
-`;
-};
-
-type Param = NamedShape<Nullable<NativeModuleParamTypeAnnotation>>;
-
-function serializeArg(
-  moduleName: string,
-  arg: Param,
-  index: number,
-  resolveAlias: AliasResolver,
-  enumMap: NativeModuleEnumMap,
-): string {
-  const {typeAnnotation: nullableTypeAnnotation, optional} = arg;
-  const [typeAnnotation, nullable] =
-    unwrapNullable<NativeModuleParamTypeAnnotation>(nullableTypeAnnotation);
-
-  let realTypeAnnotation = typeAnnotation;
-  if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
-    realTypeAnnotation = resolveAlias(realTypeAnnotation.name);
-  }
-
-  function wrap(callback: (val: string) => string) {
-    const val = `args[${index}]`;
-    const expression = callback(val);
-
-    // param?: T
-    if (optional && !nullable) {
-      // throw new Error('are we hitting this case? ' + moduleName);
-      return `count <= ${index} || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`;
-    }
-
-    // param: ?T
-    // param?: ?T
-    if (nullable || optional) {
-      return `count <= ${index} || ${val}.isNull() || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`;
-    }
-
-    // param: T
-    return `count <= ${index} ? throw jsi::JSError(rt, "Expected argument in position ${index} to be passed") : ${expression}`;
-  }
-
-  switch (realTypeAnnotation.type) {
-    case 'ReservedTypeAnnotation':
-      switch (realTypeAnnotation.name) {
-        case 'RootTag':
-          return wrap(val => `${val}.asNumber()`);
-        default:
-          (realTypeAnnotation.name: empty);
-          throw new Error(
-            `Unknown prop type for "${arg.name}, found: ${realTypeAnnotation.name}"`,
-          );
-      }
-    case 'StringTypeAnnotation':
-      return wrap(val => `${val}.asString(rt)`);
-    case 'StringLiteralTypeAnnotation':
-      return wrap(val => `${val}.asString(rt)`);
-    case 'StringLiteralUnionTypeAnnotation':
-      return wrap(val => `${val}.asString(rt)`);
-    case 'BooleanTypeAnnotation':
-      return wrap(val => `${val}.asBool()`);
-    case 'EnumDeclaration':
-      switch (realTypeAnnotation.memberType) {
-        case 'NumberTypeAnnotation':
-          return wrap(val => `${val}.asNumber()`);
-        case 'StringTypeAnnotation':
-          return wrap(val => `${val}.asString(rt)`);
-        default:
-          throw new Error(
-            `Unknown enum type for "${arg.name}, found: ${realTypeAnnotation.type}"`,
-          );
-      }
-    case 'NumberTypeAnnotation':
-      return wrap(val => `${val}.asNumber()`);
-    case 'FloatTypeAnnotation':
-      return wrap(val => `${val}.asNumber()`);
-    case 'DoubleTypeAnnotation':
-      return wrap(val => `${val}.asNumber()`);
-    case 'Int32TypeAnnotation':
-      return wrap(val => `${val}.asNumber()`);
-    case 'NumberLiteralTypeAnnotation':
-      return wrap(val => `${val}.asNumber()`);
-    case 'ArrayTypeAnnotation':
-      return wrap(val => `${val}.asObject(rt).asArray(rt)`);
-    case 'FunctionTypeAnnotation':
-      return wrap(val => `${val}.asObject(rt).asFunction(rt)`);
-    case 'GenericObjectTypeAnnotation':
-      return wrap(val => `${val}.asObject(rt)`);
-    case 'UnionTypeAnnotation':
-      switch (typeAnnotation.memberType) {
-        case 'NumberTypeAnnotation':
-          return wrap(val => `${val}.asNumber()`);
-        case 'ObjectTypeAnnotation':
-          return wrap(val => `${val}.asObject(rt)`);
-        case 'StringTypeAnnotation':
-          return wrap(val => `${val}.asString(rt)`);
-        default:
-          throw new Error(
-            `Unsupported union member type for param  "${arg.name}, found: ${realTypeAnnotation.memberType}"`,
-          );
-      }
-    case 'ObjectTypeAnnotation':
-      return wrap(val => `${val}.asObject(rt)`);
-    case 'MixedTypeAnnotation':
-      return wrap(val => `jsi::Value(rt, ${val})`);
-    default:
-      (realTypeAnnotation.type: empty);
-      throw new Error(
-        `Unknown prop type for "${arg.name}, found: ${realTypeAnnotation.type}"`,
-      );
-  }
-}
-
-function serializePropertyIntoHostFunction(
-  moduleName: string,
-  hasteModuleName: string,
-  property: NativeModulePropertyShape,
-  resolveAlias: AliasResolver,
-  enumMap: NativeModuleEnumMap,
-): string {
-  const [propertyTypeAnnotation] =
-    unwrapNullable<NativeModuleFunctionTypeAnnotation>(property.typeAnnotation);
-
-  return HostFunctionTemplate({
-    hasteModuleName,
-    methodName: property.name,
-    returnTypeAnnotation: propertyTypeAnnotation.returnTypeAnnotation,
-    args: propertyTypeAnnotation.params.map((p, i) =>
-      serializeArg(moduleName, p, i, resolveAlias, enumMap),
-    ),
-  });
-}
-
-module.exports = {
-  generate(
-    libraryName: string,
-    schema: SchemaType,
-    packageName?: string,
-    assumeNonnull: boolean = false,
-    headerPrefix?: string,
-  ): FilesOutput {
-    const nativeModules = getModules(schema);
-
-    const modules = Object.keys(nativeModules)
-      .map((hasteModuleName: string) => {
-        const nativeModule = nativeModules[hasteModuleName];
-        const {
-          aliasMap,
-          enumMap,
-          spec: {methods},
-          moduleName,
-        } = nativeModule;
-        const resolveAlias = createAliasResolver(aliasMap);
-        const hostFunctions = methods.map(property =>
-          serializePropertyIntoHostFunction(
-            moduleName,
-            hasteModuleName,
-            property,
-            resolveAlias,
-            enumMap,
-          ),
-        );
-
-        return ModuleTemplate({
-          hasteModuleName,
-          hostFunctions,
-          moduleName,
-          methods: methods.map(
-            ({name: propertyName, typeAnnotation: nullableTypeAnnotation}) => {
-              const [{params}] = unwrapNullable(nullableTypeAnnotation);
-              return {
-                methodName: propertyName,
-                paramCount: params.length,
-              };
-            },
-          ),
-        });
-      })
-      .join('\n');
-
-    const fileName = `${libraryName}JSI-generated.cpp`;
-    const replacedTemplate = FileTemplate({
-      modules,
-      libraryName,
-    });
-    return new Map([[fileName, replacedTemplate]]);
-  },
-};

packages/react-native-codegen/src/generators/modules/GenerateModuleH.js

@@ -9,17 +9,17 @@
  */
 
 'use strict';
+
 import type {
   NamedShape,
-  NativeModuleBaseTypeAnnotation,
-} from '../../CodegenSchema';
-import type {
   NativeModuleAliasMap,
+  NativeModuleBaseTypeAnnotation,
   NativeModuleEnumMap,
   NativeModuleEnumMember,
   NativeModuleEnumMemberType,
   NativeModuleEventEmitterShape,
   NativeModuleFunctionTypeAnnotation,
+  NativeModuleParamTypeAnnotation,
   NativeModulePropertyShape,
   NativeModuleTypeAnnotation,
   Nullable,
@@ -30,7 +30,6 @@ import type {AliasResolver} from './Utils';
 const {unwrapNullable} = require('../../parsers/parsers-commons');
 const {wrapOptional} = require('../TypeUtils/Cxx');
 const {getEnumName, toPascalCase, toSafeCppString} = require('../Utils');
-const {indent} = require('../Utils');
 const {
   createAliasResolver,
   getModules,
@@ -40,74 +39,151 @@ const {
 
 type FilesOutput = Map<string, string>;
 
-const ModuleClassDeclarationTemplate = ({
-  hasteModuleName,
-  moduleProperties,
-  structs,
-  enums,
-}: $ReadOnly<{
-  hasteModuleName: string,
-  moduleProperties: string[],
-  structs: string,
-  enums: string,
-}>) => {
-  return `${enums}
-  ${structs}class JSI_EXPORT ${hasteModuleName}CxxSpecJSI : public TurboModule {
-protected:
-  ${hasteModuleName}CxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
+type Param = NamedShape<Nullable<NativeModuleParamTypeAnnotation>>;
 
-public:
-  ${indent(moduleProperties.join('\n'), 2)}
+function serializeArg(
+  moduleName: string,
+  arg: Param,
+  index: number,
+  resolveAlias: AliasResolver,
+  enumMap: NativeModuleEnumMap,
+): string {
+  const {typeAnnotation: nullableTypeAnnotation, optional} = arg;
+  const [typeAnnotation, nullable] =
+    unwrapNullable<NativeModuleParamTypeAnnotation>(nullableTypeAnnotation);
 
-};`;
-};
+  let realTypeAnnotation = typeAnnotation;
+  if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
+    realTypeAnnotation = resolveAlias(realTypeAnnotation.name);
+  }
+
+  function wrap(callback: (val: string) => string) {
+    const val = `args[${index}]`;
+    const expression = callback(val);
+
+    // param?: T
+    if (optional && !nullable) {
+      // throw new Error('are we hitting this case? ' + moduleName);
+      return `count <= ${index} || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`;
+    }
+
+    // param: ?T
+    // param?: ?T
+    if (nullable || optional) {
+      return `count <= ${index} || ${val}.isNull() || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`;
+    }
+
+    // param: T
+    return `count <= ${index} ? throw jsi::JSError(rt, "Expected argument in position ${index} to be passed") : ${expression}`;
+  }
+
+  switch (realTypeAnnotation.type) {
+    case 'ReservedTypeAnnotation':
+      switch (realTypeAnnotation.name) {
+        case 'RootTag':
+          return wrap(val => `${val}.asNumber()`);
+        default:
+          (realTypeAnnotation.name: empty);
+          throw new Error(
+            `Unknown prop type for "${arg.name}, found: ${realTypeAnnotation.name}"`,
+          );
+      }
+    case 'StringTypeAnnotation':
+      return wrap(val => `${val}.asString(rt)`);
+    case 'StringLiteralTypeAnnotation':
+      return wrap(val => `${val}.asString(rt)`);
+    case 'StringLiteralUnionTypeAnnotation':
+      return wrap(val => `${val}.asString(rt)`);
+    case 'BooleanTypeAnnotation':
+      return wrap(val => `${val}.asBool()`);
+    case 'EnumDeclaration':
+      switch (realTypeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return wrap(val => `${val}.asNumber()`);
+        case 'StringTypeAnnotation':
+          return wrap(val => `${val}.asString(rt)`);
+        default:
+          throw new Error(
+            `Unknown enum type for "${arg.name}, found: ${realTypeAnnotation.type}"`,
+          );
+      }
+    case 'NumberTypeAnnotation':
+      return wrap(val => `${val}.asNumber()`);
+    case 'FloatTypeAnnotation':
+      return wrap(val => `${val}.asNumber()`);
+    case 'DoubleTypeAnnotation':
+      return wrap(val => `${val}.asNumber()`);
+    case 'Int32TypeAnnotation':
+      return wrap(val => `${val}.asNumber()`);
+    case 'NumberLiteralTypeAnnotation':
+      return wrap(val => `${val}.asNumber()`);
+    case 'ArrayTypeAnnotation':
+      return wrap(val => `${val}.asObject(rt).asArray(rt)`);
+    case 'FunctionTypeAnnotation':
+      return wrap(val => `${val}.asObject(rt).asFunction(rt)`);
+    case 'GenericObjectTypeAnnotation':
+      return wrap(val => `${val}.asObject(rt)`);
+    case 'UnionTypeAnnotation':
+      switch (typeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return wrap(val => `${val}.asNumber()`);
+        case 'ObjectTypeAnnotation':
+          return wrap(val => `${val}.asObject(rt)`);
+        case 'StringTypeAnnotation':
+          return wrap(val => `${val}.asString(rt)`);
+        default:
+          throw new Error(
+            `Unsupported union member type for param  "${arg.name}, found: ${realTypeAnnotation.memberType}"`,
+          );
+      }
+    case 'ObjectTypeAnnotation':
+      return wrap(val => `${val}.asObject(rt)`);
+    case 'MixedTypeAnnotation':
+      return wrap(val => `jsi::Value(rt, ${val})`);
+    default:
+      (realTypeAnnotation.type: empty);
+      throw new Error(
+        `Unknown prop type for "${arg.name}, found: ${realTypeAnnotation.type}"`,
+      );
+  }
+}
 
 const ModuleSpecClassDeclarationTemplate = ({
   hasteModuleName,
   moduleName,
+  structs,
+  enums,
   moduleEventEmitters,
-  moduleProperties,
+  moduleFunctions,
+  methods,
 }: $ReadOnly<{
   hasteModuleName: string,
   moduleName: string,
+  structs: string,
+  enums: string,
   moduleEventEmitters: EventEmitterCpp[],
-  moduleProperties: string[],
+  moduleFunctions: string[],
+  methods: $ReadOnlyArray<$ReadOnly<{methodName: string, paramCount: number}>>,
 }>) => {
-  return `template <typename T>
+  return `${enums}${structs}
+template <typename T>
 class JSI_EXPORT ${hasteModuleName}CxxSpec : public TurboModule {
 public:
-  jsi::Value create(jsi::Runtime &rt, const jsi::PropNameID &propName) override {
-    return delegate_.create(rt, propName);
-  }
-
-  std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime& runtime) override {
-    return delegate_.getPropertyNames(runtime);
-  }
-
   static constexpr std::string_view kModuleName = "${moduleName}";
 
 protected:
-  ${hasteModuleName}CxxSpec(std::shared_ptr<CallInvoker> jsInvoker)
-    : TurboModule(std::string{${hasteModuleName}CxxSpec::kModuleName}, jsInvoker),
-      delegate_(reinterpret_cast<T*>(this), jsInvoker) {}
-${moduleEventEmitters.map(e => e.emitFunction).join('\n')}
-
+  ${hasteModuleName}CxxSpec(std::shared_ptr<CallInvoker> jsInvoker) : TurboModule(std::string{${hasteModuleName}CxxSpec::kModuleName}, jsInvoker) {
+${methods
+  .map(({methodName, paramCount}) => {
+    return `    methodMap_["${methodName}"] = MethodMetadata {.argCount = ${paramCount}, .invoker = __${methodName}};`;
+  })
+  .join(
+    '\n',
+  )}${moduleEventEmitters.length > 0 ? '\n' : ''}${moduleEventEmitters.map(e => e.registerEventEmitter).join('\n')}
+  }
+  ${moduleEventEmitters.map(e => e.emitFunction).join('\n')}
 private:
-  class Delegate : public ${hasteModuleName}CxxSpecJSI {
-  public:
-    Delegate(T *instance, std::shared_ptr<CallInvoker> jsInvoker) :
-      ${hasteModuleName}CxxSpecJSI(std::move(jsInvoker)), instance_(instance) {
-${moduleEventEmitters.map(e => e.registerEventEmitter).join('\n')}
-    }
-
-    ${indent(moduleProperties.join('\n'), 4)}
-
-  private:
-    friend class ${hasteModuleName}CxxSpec;
-    T *instance_;
-  };
-
-  Delegate delegate_;
+${moduleFunctions.join('\n\n')}
 };`;
 };
 
@@ -292,7 +368,7 @@ function createStructsString(
     return bridging::toJs(rt, value);
   }`,
         )
-        .join('\n\n');
+        .join('\n');
       return `
 #pragma mark - ${structName}
 
@@ -476,19 +552,19 @@ function createEnums(
     .join('\n');
 }
 
-function translatePropertyToCpp(
+function translateFunctionToCpp(
   hasteModuleName: string,
   prop: NativeModulePropertyShape,
   resolveAlias: AliasResolver,
   enumMap: NativeModuleEnumMap,
-  abstract: boolean = false,
+  args: Array<string>,
+  returnTypeAnnotation: Nullable<NativeModuleTypeAnnotation>,
 ): string {
   const [propTypeAnnotation] =
     unwrapNullable<NativeModuleFunctionTypeAnnotation>(prop.typeAnnotation);
 
-  const params = propTypeAnnotation.params.map(
-    param => `std::move(${param.name})`,
-  );
+  const isNullable = returnTypeAnnotation.type === 'NullableTypeAnnotation';
+  const isVoid = returnTypeAnnotation.type === 'VoidTypeAnnotation';
 
   const paramTypes = propTypeAnnotation.params.map(param => {
     const translatedParam = translatePrimitiveJSTypeToCpp(
@@ -503,6 +579,7 @@ function translatePropertyToCpp(
     );
     return `${translatedParam} ${param.name}`;
   });
+  paramTypes.unshift('jsi::Runtime &rt');
 
   const returnType = translatePrimitiveJSTypeToCpp(
     hasteModuleName,
@@ -514,23 +591,16 @@ function translatePropertyToCpp(
     enumMap,
   );
 
-  // The first param will always be the runtime reference.
-  paramTypes.unshift('jsi::Runtime &rt');
-
-  const method = `${returnType} ${prop.name}(${paramTypes.join(', ')})`;
-
-  if (abstract) {
-    return `virtual ${method} = 0;`;
+  let methodCallArgs = [...args].join(',\n      ');
+  if (methodCallArgs.length > 0) {
+    methodCallArgs = `,\n      ${methodCallArgs}`;
   }
 
-  return `${method} override {
-  static_assert(
+  return `  static jsi::Value __${prop.name}(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* ${args.length > 0 ? 'args' : '/*args*/'}, size_t ${args.length > 0 ? 'count' : '/*count*/'}) {
+    static_assert(
       bridging::getParameterCount(&T::${prop.name}) == ${paramTypes.length},
       "Expected ${prop.name}(...) to have ${paramTypes.length} parameters");
-
-  return bridging::callFromJs<${returnType}>(
-      rt, &T::${prop.name}, jsInvoker_, ${['instance_', ...params].join(', ')});
-}`;
+    ${!isVoid ? (!isNullable ? 'return ' : 'auto result = ') : ''}bridging::callFromJs<${returnType}>(rt, &T::${prop.name},  static_cast<${hasteModuleName}CxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule)${methodCallArgs});${!isVoid ? (!isNullable ? '' : 'return result ? jsi::Value(std::move(*result)) : jsi::Value::null();') : 'return jsi::Value::undefined();'}\n  }`;
 }
 
 type EventEmitterCpp = {
@@ -563,7 +633,7 @@ function translateEventEmitterToCpp(
   return {
     isVoidTypeAnnotation: isVoidTypeAnnotation,
     templateName: isVoidTypeAnnotation ? `/*${templateName}*/` : templateName,
-    registerEventEmitter: `      eventEmitterMap_["${
+    registerEventEmitter: `    eventEmitterMap_["${
       eventEmitter.name
     }"] = std::make_shared<AsyncEventEmitter<${
       isVoidTypeAnnotation ? '' : 'jsi::Value'
@@ -585,7 +655,7 @@ function translateEventEmitterToCpp(
   }
     static_cast<AsyncEventEmitter<${
       isVoidTypeAnnotation ? '' : 'jsi::Value'
-    }>&>(*delegate_.eventEmitterMap_["${eventEmitter.name}"]).emit(${
+    }>&>(*eventEmitterMap_["${eventEmitter.name}"]).emit(${
       isVoidTypeAnnotation
         ? ''
         : `[jsInvoker = jsInvoker_, eventValue = value](jsi::Runtime& rt) -> jsi::Value {
@@ -607,8 +677,14 @@ module.exports = {
     const nativeModules = getModules(schema);
 
     const modules = Object.keys(nativeModules).flatMap(hasteModuleName => {
-      const {aliasMap, enumMap, spec, moduleName} =
-        nativeModules[hasteModuleName];
+      const nativeModule = nativeModules[hasteModuleName];
+      const {
+        aliasMap,
+        enumMap,
+        spec: {methods},
+        spec,
+        moduleName,
+      } = nativeModule;
       const resolveAlias = createAliasResolver(aliasMap);
       const structs = createStructsString(
         hasteModuleName,
@@ -617,25 +693,12 @@ module.exports = {
         enumMap,
       );
       const enums = createEnums(hasteModuleName, enumMap, resolveAlias);
-
       return [
-        ModuleClassDeclarationTemplate({
-          hasteModuleName,
-          moduleProperties: spec.methods.map(prop =>
-            translatePropertyToCpp(
-              hasteModuleName,
-              prop,
-              resolveAlias,
-              enumMap,
-              true,
-            ),
-          ),
-          structs,
-          enums,
-        }),
         ModuleSpecClassDeclarationTemplate({
           hasteModuleName,
           moduleName,
+          structs,
+          enums,
           moduleEventEmitters: spec.eventEmitters.map(eventEmitter =>
             translateEventEmitterToCpp(
               moduleName,
@@ -644,13 +707,30 @@ module.exports = {
               enumMap,
             ),
           ),
-          moduleProperties: spec.methods.map(prop =>
-            translatePropertyToCpp(
+          moduleFunctions: spec.methods.map(property => {
+            const [propertyTypeAnnotation] =
+              unwrapNullable<NativeModuleFunctionTypeAnnotation>(
+                property.typeAnnotation,
+              );
+            return translateFunctionToCpp(
               hasteModuleName,
-              prop,
+              property,
               resolveAlias,
               enumMap,
-            ),
+              propertyTypeAnnotation.params.map((p, i) =>
+                serializeArg(moduleName, p, i, resolveAlias, enumMap),
+              ),
+              propertyTypeAnnotation.returnTypeAnnotation,
+            );
+          }),
+          methods: methods.map(
+            ({name: propertyName, typeAnnotation: nullableTypeAnnotation}) => {
+              const [{params}] = unwrapNullable(nullableTypeAnnotation);
+              return {
+                methodName: propertyName,
+                paramCount: params.length,
+              };
+            },
           ),
         }),
       ];

packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleCpp-test.js

@@ -1,32 +0,0 @@
-/**
- * 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
- */
-
-'use strict';
-
-const fixtures = require('../__test_fixtures__/fixtures.js');
-const generator = require('../GenerateModuleCpp.js');
-
-describe('GenerateModuleCpp', () => {
-  Object.keys(fixtures)
-    .sort()
-    .forEach(fixtureName => {
-      const fixture = fixtures[fixtureName];
-
-      it(`can generate fixture ${fixtureName}`, () => {
-        expect(
-          generator.generate(
-            fixtureName,
-            fixture,
-            'com.facebook.fbreact.specs',
-          ),
-        ).toMatchSnapshot();
-      });
-    });
-});

packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleCpp-test.js.snap

@@ -1,782 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`GenerateModuleCpp can generate fixture SampleWithUppercaseName 1`] = `
-Map {
-  "SampleWithUppercaseNameJSI-generated.cpp" => "/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleCpp.js
- */
-
-#include \\"SampleWithUppercaseNameJSI.h\\"
-
-namespace facebook::react {
-
-
-
-NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule(\\"SampleTurboModule\\", jsInvoker) {
-
-}
-
-
-} // namespace facebook::react
-",
-}
-`;
-
-exports[`GenerateModuleCpp can generate fixture complex_objects 1`] = `
-Map {
-  "complex_objectsJSI-generated.cpp" => "/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleCpp.js
- */
-
-#include \\"complex_objectsJSI.h\\"
-
-namespace facebook::react {
-
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_difficult(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->difficult(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_optionals(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->optionals(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt)
-  );
-  return jsi::Value::undefined();
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_optionalMethod(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->optionalMethod(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt),
-    count <= 1 ? throw jsi::JSError(rt, \\"Expected argument in position 1 to be passed\\") : args[1].asObject(rt).asFunction(rt),
-    count <= 2 || args[2].isUndefined() ? std::nullopt : std::make_optional(args[2].asObject(rt).asArray(rt))
-  );
-  return jsi::Value::undefined();
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getArrays(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getArrays(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt)
-  );
-  return jsi::Value::undefined();
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getNullableObject(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  auto result = static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getNullableObject(
-    rt
-  );
-  return result ? jsi::Value(std::move(*result)) : jsi::Value::null();
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getNullableGenericObject(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  auto result = static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getNullableGenericObject(
-    rt
-  );
-  return result ? jsi::Value(std::move(*result)) : jsi::Value::null();
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getNullableArray(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  auto result = static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getNullableArray(
-    rt
-  );
-  return result ? jsi::Value(std::move(*result)) : jsi::Value::null();
-}
-
-NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule(\\"SampleTurboModule\\", jsInvoker) {
-  methodMap_[\\"difficult\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_difficult};
-  methodMap_[\\"optionals\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_optionals};
-  methodMap_[\\"optionalMethod\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_optionalMethod};
-  methodMap_[\\"getArrays\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getArrays};
-  methodMap_[\\"getNullableObject\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getNullableObject};
-  methodMap_[\\"getNullableGenericObject\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getNullableGenericObject};
-  methodMap_[\\"getNullableArray\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getNullableArray};
-}
-
-
-} // namespace facebook::react
-",
-}
-`;
-
-exports[`GenerateModuleCpp can generate fixture cxx_only_native_modules 1`] = `
-Map {
-  "cxx_only_native_modulesJSI-generated.cpp" => "/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleCpp.js
- */
-
-#include \\"cxx_only_native_modulesJSI.h\\"
-
-namespace facebook::react {
-
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getArray(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getArray(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt).asArray(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getBool(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getBool(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asBool()
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getConstants(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getConstants(
-    rt
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getCustomEnum(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getCustomEnum(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asNumber()
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getCustomHostObject(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getCustomHostObject(
-    rt
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_consumeCustomHostObject(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->consumeCustomHostObject(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getBinaryTreeNode(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getBinaryTreeNode(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getGraphNode(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getGraphNode(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getNumEnum(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getNumEnum(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asNumber()
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getStrEnum(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getStrEnum(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asString(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getMap(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getMap(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getNumber(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getNumber(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asNumber()
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getObject(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getObject(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getSet(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getSet(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt).asArray(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getString(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getString(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asString(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getUnion(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getUnion(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asNumber(),
-    count <= 1 ? throw jsi::JSError(rt, \\"Expected argument in position 1 to be passed\\") : args[1].asString(rt),
-    count <= 2 ? throw jsi::JSError(rt, \\"Expected argument in position 2 to be passed\\") : args[2].asString(rt),
-    count <= 3 ? throw jsi::JSError(rt, \\"Expected argument in position 3 to be passed\\") : args[3].asObject(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValue(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getValue(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asNumber(),
-    count <= 1 ? throw jsi::JSError(rt, \\"Expected argument in position 1 to be passed\\") : args[1].asString(rt),
-    count <= 2 ? throw jsi::JSError(rt, \\"Expected argument in position 2 to be passed\\") : args[2].asObject(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithCallback(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getValueWithCallback(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt).asFunction(rt)
-  );
-  return jsi::Value::undefined();
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithPromise(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getValueWithPromise(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asBool()
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getWithWithOptionalArgs(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  auto result = static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getWithWithOptionalArgs(
-    rt,
-    count <= 0 || args[0].isUndefined() ? std::nullopt : std::make_optional(args[0].asBool())
-  );
-  return result ? jsi::Value(std::move(*result)) : jsi::Value::null();
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFunc(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->voidFunc(
-    rt
-  );
-  return jsi::Value::undefined();
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_setMenu(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->setMenu(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt)
-  );
-  return jsi::Value::undefined();
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_emitCustomDeviceEvent(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->emitCustomDeviceEvent(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asString(rt)
-  );
-  return jsi::Value::undefined();
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFuncThrows(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->voidFuncThrows(
-    rt
-  );
-  return jsi::Value::undefined();
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getObjectThrows(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getObjectThrows(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFuncAssert(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->voidFuncAssert(
-    rt
-  );
-  return jsi::Value::undefined();
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getObjectAssert(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getObjectAssert(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt)
-  );
-}
-
-NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule(\\"SampleTurboModuleCxx\\", jsInvoker) {
-  methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getArray};
-  methodMap_[\\"getBool\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getBool};
-  methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getConstants};
-  methodMap_[\\"getCustomEnum\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getCustomEnum};
-  methodMap_[\\"getCustomHostObject\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getCustomHostObject};
-  methodMap_[\\"consumeCustomHostObject\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_consumeCustomHostObject};
-  methodMap_[\\"getBinaryTreeNode\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getBinaryTreeNode};
-  methodMap_[\\"getGraphNode\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getGraphNode};
-  methodMap_[\\"getNumEnum\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getNumEnum};
-  methodMap_[\\"getStrEnum\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getStrEnum};
-  methodMap_[\\"getMap\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getMap};
-  methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getNumber};
-  methodMap_[\\"getObject\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getObject};
-  methodMap_[\\"getSet\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getSet};
-  methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getString};
-  methodMap_[\\"getUnion\\"] = MethodMetadata {4, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getUnion};
-  methodMap_[\\"getValue\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValue};
-  methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithCallback};
-  methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithPromise};
-  methodMap_[\\"getWithWithOptionalArgs\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getWithWithOptionalArgs};
-  methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFunc};
-  methodMap_[\\"setMenu\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_setMenu};
-  methodMap_[\\"emitCustomDeviceEvent\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_emitCustomDeviceEvent};
-  methodMap_[\\"voidFuncThrows\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFuncThrows};
-  methodMap_[\\"getObjectThrows\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getObjectThrows};
-  methodMap_[\\"voidFuncAssert\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFuncAssert};
-  methodMap_[\\"getObjectAssert\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getObjectAssert};
-}
-
-
-} // namespace facebook::react
-",
-}
-`;
-
-exports[`GenerateModuleCpp can generate fixture empty_native_modules 1`] = `
-Map {
-  "empty_native_modulesJSI-generated.cpp" => "/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleCpp.js
- */
-
-#include \\"empty_native_modulesJSI.h\\"
-
-namespace facebook::react {
-
-
-
-NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule(\\"SampleTurboModule\\", jsInvoker) {
-
-}
-
-
-} // namespace facebook::react
-",
-}
-`;
-
-exports[`GenerateModuleCpp can generate fixture event_emitter_module 1`] = `
-Map {
-  "event_emitter_moduleJSI-generated.cpp" => "/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleCpp.js
- */
-
-#include \\"event_emitter_moduleJSI.h\\"
-
-namespace facebook::react {
-
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFunc(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->voidFunc(
-    rt
-  );
-  return jsi::Value::undefined();
-}
-
-NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule(\\"SampleTurboModule\\", jsInvoker) {
-  methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFunc};
-}
-
-
-} // namespace facebook::react
-",
-}
-`;
-
-exports[`GenerateModuleCpp can generate fixture native_modules_with_type_aliases 1`] = `
-Map {
-  "native_modules_with_type_aliasesJSI-generated.cpp" => "/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleCpp.js
- */
-
-#include \\"native_modules_with_type_aliasesJSI.h\\"
-
-namespace facebook::react {
-
-static jsi::Value __hostFunction_AliasTurboModuleCxxSpecJSI_getConstants(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<AliasTurboModuleCxxSpecJSI *>(&turboModule)->getConstants(
-    rt
-  );
-}
-static jsi::Value __hostFunction_AliasTurboModuleCxxSpecJSI_cropImage(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<AliasTurboModuleCxxSpecJSI *>(&turboModule)->cropImage(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt)
-  );
-  return jsi::Value::undefined();
-}
-
-AliasTurboModuleCxxSpecJSI::AliasTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule(\\"AliasTurboModule\\", jsInvoker) {
-  methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_AliasTurboModuleCxxSpecJSI_getConstants};
-  methodMap_[\\"cropImage\\"] = MethodMetadata {1, __hostFunction_AliasTurboModuleCxxSpecJSI_cropImage};
-}
-
-
-} // namespace facebook::react
-",
-}
-`;
-
-exports[`GenerateModuleCpp can generate fixture real_module_example 1`] = `
-Map {
-  "real_module_exampleJSI-generated.cpp" => "/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleCpp.js
- */
-
-#include \\"real_module_exampleJSI.h\\"
-
-namespace facebook::react {
-
-static jsi::Value __hostFunction_NativeCameraRollManagerCxxSpecJSI_getConstants(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeCameraRollManagerCxxSpecJSI *>(&turboModule)->getConstants(
-    rt
-  );
-}
-static jsi::Value __hostFunction_NativeCameraRollManagerCxxSpecJSI_getPhotos(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeCameraRollManagerCxxSpecJSI *>(&turboModule)->getPhotos(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeCameraRollManagerCxxSpecJSI_saveToCameraRoll(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeCameraRollManagerCxxSpecJSI *>(&turboModule)->saveToCameraRoll(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asString(rt),
-    count <= 1 ? throw jsi::JSError(rt, \\"Expected argument in position 1 to be passed\\") : args[1].asString(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeCameraRollManagerCxxSpecJSI_deletePhotos(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeCameraRollManagerCxxSpecJSI *>(&turboModule)->deletePhotos(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt).asArray(rt)
-  );
-}
-
-NativeCameraRollManagerCxxSpecJSI::NativeCameraRollManagerCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule(\\"CameraRollManager\\", jsInvoker) {
-  methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeCameraRollManagerCxxSpecJSI_getConstants};
-  methodMap_[\\"getPhotos\\"] = MethodMetadata {1, __hostFunction_NativeCameraRollManagerCxxSpecJSI_getPhotos};
-  methodMap_[\\"saveToCameraRoll\\"] = MethodMetadata {2, __hostFunction_NativeCameraRollManagerCxxSpecJSI_saveToCameraRoll};
-  methodMap_[\\"deletePhotos\\"] = MethodMetadata {1, __hostFunction_NativeCameraRollManagerCxxSpecJSI_deletePhotos};
-}
-static jsi::Value __hostFunction_NativeExceptionsManagerCxxSpecJSI_reportFatalException(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeExceptionsManagerCxxSpecJSI *>(&turboModule)->reportFatalException(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asString(rt),
-    count <= 1 ? throw jsi::JSError(rt, \\"Expected argument in position 1 to be passed\\") : args[1].asObject(rt).asArray(rt),
-    count <= 2 ? throw jsi::JSError(rt, \\"Expected argument in position 2 to be passed\\") : args[2].asNumber()
-  );
-  return jsi::Value::undefined();
-}
-static jsi::Value __hostFunction_NativeExceptionsManagerCxxSpecJSI_reportSoftException(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeExceptionsManagerCxxSpecJSI *>(&turboModule)->reportSoftException(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asString(rt),
-    count <= 1 ? throw jsi::JSError(rt, \\"Expected argument in position 1 to be passed\\") : args[1].asObject(rt).asArray(rt),
-    count <= 2 ? throw jsi::JSError(rt, \\"Expected argument in position 2 to be passed\\") : args[2].asNumber()
-  );
-  return jsi::Value::undefined();
-}
-static jsi::Value __hostFunction_NativeExceptionsManagerCxxSpecJSI_reportException(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeExceptionsManagerCxxSpecJSI *>(&turboModule)->reportException(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt)
-  );
-  return jsi::Value::undefined();
-}
-static jsi::Value __hostFunction_NativeExceptionsManagerCxxSpecJSI_updateExceptionMessage(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeExceptionsManagerCxxSpecJSI *>(&turboModule)->updateExceptionMessage(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asString(rt),
-    count <= 1 ? throw jsi::JSError(rt, \\"Expected argument in position 1 to be passed\\") : args[1].asObject(rt).asArray(rt),
-    count <= 2 ? throw jsi::JSError(rt, \\"Expected argument in position 2 to be passed\\") : args[2].asNumber()
-  );
-  return jsi::Value::undefined();
-}
-static jsi::Value __hostFunction_NativeExceptionsManagerCxxSpecJSI_dismissRedbox(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeExceptionsManagerCxxSpecJSI *>(&turboModule)->dismissRedbox(
-    rt
-  );
-  return jsi::Value::undefined();
-}
-
-NativeExceptionsManagerCxxSpecJSI::NativeExceptionsManagerCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule(\\"ExceptionsManager\\", jsInvoker) {
-  methodMap_[\\"reportFatalException\\"] = MethodMetadata {3, __hostFunction_NativeExceptionsManagerCxxSpecJSI_reportFatalException};
-  methodMap_[\\"reportSoftException\\"] = MethodMetadata {3, __hostFunction_NativeExceptionsManagerCxxSpecJSI_reportSoftException};
-  methodMap_[\\"reportException\\"] = MethodMetadata {1, __hostFunction_NativeExceptionsManagerCxxSpecJSI_reportException};
-  methodMap_[\\"updateExceptionMessage\\"] = MethodMetadata {3, __hostFunction_NativeExceptionsManagerCxxSpecJSI_updateExceptionMessage};
-  methodMap_[\\"dismissRedbox\\"] = MethodMetadata {0, __hostFunction_NativeExceptionsManagerCxxSpecJSI_dismissRedbox};
-}
-
-
-} // namespace facebook::react
-",
-}
-`;
-
-exports[`GenerateModuleCpp can generate fixture simple_native_modules 1`] = `
-Map {
-  "simple_native_modulesJSI-generated.cpp" => "/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleCpp.js
- */
-
-#include \\"simple_native_modulesJSI.h\\"
-
-namespace facebook::react {
-
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getConstants(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getConstants(
-    rt
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFunc(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->voidFunc(
-    rt
-  );
-  return jsi::Value::undefined();
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getBool(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getBool(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asBool()
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getNumber(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getNumber(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asNumber()
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getString(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getString(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asString(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getArray(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getArray(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt).asArray(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getObject(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getObject(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getRootTag(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getRootTag(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asNumber()
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValue(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getValue(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asNumber(),
-    count <= 1 ? throw jsi::JSError(rt, \\"Expected argument in position 1 to be passed\\") : args[1].asString(rt),
-    count <= 2 ? throw jsi::JSError(rt, \\"Expected argument in position 2 to be passed\\") : args[2].asObject(rt)
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getEnumReturn(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getEnumReturn(
-    rt
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithCallback(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getValueWithCallback(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asObject(rt).asFunction(rt)
-  );
-  return jsi::Value::undefined();
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithPromise(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getValueWithPromise(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asBool()
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithOptionalArg(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getValueWithOptionalArg(
-    rt,
-    count <= 0 || args[0].isUndefined() ? std::nullopt : std::make_optional(args[0].asObject(rt))
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getEnums(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getEnums(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asNumber(),
-    count <= 1 ? throw jsi::JSError(rt, \\"Expected argument in position 1 to be passed\\") : args[1].asNumber(),
-    count <= 2 ? throw jsi::JSError(rt, \\"Expected argument in position 2 to be passed\\") : args[2].asString(rt)
-  );
-}
-
-NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule(\\"SampleTurboModule\\", jsInvoker) {
-  methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getConstants};
-  methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFunc};
-  methodMap_[\\"getBool\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getBool};
-  methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getNumber};
-  methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getString};
-  methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getArray};
-  methodMap_[\\"getObject\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getObject};
-  methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getRootTag};
-  methodMap_[\\"getValue\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValue};
-  methodMap_[\\"getEnumReturn\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getEnumReturn};
-  methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithCallback};
-  methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithPromise};
-  methodMap_[\\"getValueWithOptionalArg\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithOptionalArg};
-  methodMap_[\\"getEnums\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getEnums};
-}
-
-
-} // namespace facebook::react
-",
-}
-`;
-
-exports[`GenerateModuleCpp can generate fixture string_literals 1`] = `
-Map {
-  "string_literalsJSI-generated.cpp" => "/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleCpp.js
- */
-
-#include \\"string_literalsJSI.h\\"
-
-namespace facebook::react {
-
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getStringLiteral(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getStringLiteral(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asString(rt)
-  );
-}
-
-NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule(\\"SampleTurboModule\\", jsInvoker) {
-  methodMap_[\\"getStringLiteral\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getStringLiteral};
-}
-
-
-} // namespace facebook::react
-",
-}
-`;
-
-exports[`GenerateModuleCpp can generate fixture two_modules_different_files 1`] = `
-Map {
-  "two_modules_different_filesJSI-generated.cpp" => "/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleCpp.js
- */
-
-#include \\"two_modules_different_filesJSI.h\\"
-
-namespace facebook::react {
-
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFunc(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->voidFunc(
-    rt
-  );
-  return jsi::Value::undefined();
-}
-
-NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule(\\"SampleTurboModule\\", jsInvoker) {
-  methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFunc};
-}
-static jsi::Value __hostFunction_NativeSampleTurboModule2CxxSpecJSI_getConstants(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModule2CxxSpecJSI *>(&turboModule)->getConstants(
-    rt
-  );
-}
-static jsi::Value __hostFunction_NativeSampleTurboModule2CxxSpecJSI_voidFunc(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeSampleTurboModule2CxxSpecJSI *>(&turboModule)->voidFunc(
-    rt
-  );
-  return jsi::Value::undefined();
-}
-
-NativeSampleTurboModule2CxxSpecJSI::NativeSampleTurboModule2CxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule(\\"SampleTurboModule2\\", jsInvoker) {
-  methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModule2CxxSpecJSI_getConstants};
-  methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModule2CxxSpecJSI_voidFunc};
-}
-
-
-} // namespace facebook::react
-",
-}
-`;
-
-exports[`GenerateModuleCpp can generate fixture union_module 1`] = `
-Map {
-  "union_moduleJSI-generated.cpp" => "/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleCpp.js
- */
-
-#include \\"union_moduleJSI.h\\"
-
-namespace facebook::react {
-
-static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getUnion(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getUnion(
-    rt,
-    count <= 0 ? throw jsi::JSError(rt, \\"Expected argument in position 0 to be passed\\") : args[0].asNumber(),
-    count <= 1 ? throw jsi::JSError(rt, \\"Expected argument in position 1 to be passed\\") : args[1].asNumber(),
-    count <= 2 ? throw jsi::JSError(rt, \\"Expected argument in position 2 to be passed\\") : args[2].asObject(rt),
-    count <= 3 ? throw jsi::JSError(rt, \\"Expected argument in position 3 to be passed\\") : args[3].asString(rt),
-    count <= 4 ? throw jsi::JSError(rt, \\"Expected argument in position 4 to be passed\\") : args[4].asString(rt)
-  );
-}
-
-NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule(\\"SampleTurboModule\\", jsInvoker) {
-  methodMap_[\\"getUnion\\"] = MethodMetadata {5, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getUnion};
-}
-
-
-} // namespace facebook::react
-",
-}
-`;

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-compatibility-check/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/compatibility-check",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "Check a React Native app's boundary between JS and Native for incompatibilities",
   "license": "MIT",
   "repository": {
@@ -29,7 +29,7 @@
     "dist"
   ],
   "dependencies": {
-    "@react-native/codegen": "0.82.0-main"
+    "@react-native/codegen": "0.83.0-main"
   },
   "devDependencies": {
     "flow-remove-types": "^2.237.2",

packages/react-native-popup-menu-android/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/popup-menu-android",
-  "version": "0.82.0-main",
+  "version": "0.83.0-main",
   "description": "PopupMenu for the Android platform",
   "main": "index.js",
   "files": [
@@ -21,7 +21,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@react-native/codegen": "0.82.0-main"
+    "@react-native/codegen": "0.83.0-main"
   },
   "peerDependencies": {
     "@types/react": "^19.1.0",

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/__tests__/AnimatedBackend-itest.js

@@ -0,0 +1,75 @@
+/**
+ * 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.
+ *
+ * @fantom_flags useSharedAnimatedBackend:true
+ * @flow strict-local
+ * @format
+ */
+
+import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
+
+import type {HostInstance} from 'react-native';
+
+import ensureInstance from '../../../src/private/__tests__/utilities/ensureInstance';
+import * as Fantom from '@react-native/fantom';
+import {createRef} from 'react';
+import {Animated, useAnimatedValue} from 'react-native';
+import ReactNativeElement from 'react-native/src/private/webapis/dom/nodes/ReactNativeElement';
+
+test('animated opacity', () => {
+  let _opacity;
+  let _opacityAnimation;
+  const viewRef = createRef<HostInstance>();
+
+  function MyApp() {
+    const opacity = useAnimatedValue(1);
+    _opacity = opacity;
+    return (
+      <Animated.View
+        ref={viewRef}
+        style={[
+          {
+            width: 100,
+            height: 100,
+            opacity: opacity,
+          },
+        ]}
+      />
+    );
+  }
+
+  const root = Fantom.createRoot();
+
+  Fantom.runTask(() => {
+    root.render(<MyApp />);
+  });
+
+  const viewElement = ensureInstance(viewRef.current, ReactNativeElement);
+
+  expect(viewElement.getBoundingClientRect().x).toBe(0);
+
+  Fantom.runTask(() => {
+    _opacityAnimation = Animated.timing(_opacity, {
+      toValue: 0,
+      duration: 30,
+      useNativeDriver: true,
+    }).start();
+  });
+
+  Fantom.unstable_produceFramesForDuration(30);
+  expect(Fantom.unstable_getDirectManipulationProps(viewElement).opacity).toBe(
+    0,
+  );
+
+  // TODO: this shouldn't be neccessary since animation should be stopped after duration
+  Fantom.runTask(() => {
+    _opacityAnimation?.stop();
+  });
+
+  expect(root.getRenderedOutput({props: ['opacity']}).toJSX()).toEqual(
+    <rn-view opacity="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>,
+>);