Fix CQS signal modernize-use-using in xplat/js/react-native-github/packages

Reviewed By: javache

Differential Revision: D81764229

.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\|ktx\)$' -> '<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\)$' -> '<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.287.0
+^0.281.0

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

@@ -17,9 +17,6 @@ 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/create-release.yml

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

.github/workflows/nightly.yml

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

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

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

.github/workflows/publish-release.yml

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

.github/workflows/retry-workflow.yml

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

.github/workflows/test-all.yml

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

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

@@ -27,7 +27,6 @@ on:
 jobs:
   validate-dotslash-artifacts:
     runs-on: ubuntu-latest
-    if: github.repository == 'facebook/react-native'
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

.gitignore

@@ -133,7 +133,6 @@ 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,109 +1,5 @@
 # Changelog
 
-## v0.82.0-rc.5
-
-### Breaking
-
-- **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))
-
-### Added
-
-#### iOS specific
-
-- **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))
-- **Fabric:** Add invalidation callback for non-recycled component instances ([dc4a6d2c7e](https://github.com/facebook/react-native/commit/dc4a6d2c7e2ed421b61929896f60b1a864a60d97) by [@kkafar](https://github.com/kkafar))
-
-## v0.82.0-rc.4
-
-### Fixed
-
-- **Hermes V1:** Fixed coordinates for Hermes V1 artifacts ([674fb77d93](https://github.com/facebook/react-native/commit/674fb77d93dfe67a5fe90449dc71b195b1851e13) by [@j-piasecki](https://github.com/j-piasecki))
-
-#### iOS specific
-
-- **Switch:** Fix Switch layout to work with iOS26 ([91d427fe52](https://github.com/facebook/react-native/commit/91d427fe52a307f9aa8579912ef956d61808dad2) by [@cipolleschi](https://github.com/cipolleschi))
-
-## v0.82.0-rc.3
-
-### Added
-
-- **Hermes V1:** Added a dependency on hermes-compiler ([0caf8e70d5](https://github.com/facebook/react-native/commit/0caf8e70d53f611a73ad9b55879dfe0a5f036371) by [@j-piasecki](https://github.com/j-piasecki))
-
-### Fixed
-
-#### Android specific
-
-- **Hermes V1:** Changed the coordinates of hermes artifacts when using Hermes V1 ([d0fb33822d](https://github.com/facebook/react-native/commit/d0fb33822de38183895c8b3421f46966909beaf3) by [@j-piasecki](https://github.com/j-piasecki))
-
-#### iOS specific
-
-- **Codegen:** Fix regression that skips artifacts code generation ([f6f5ea0b2e](https://github.com/facebook/react-native/commit/f6f5ea0b2eed894725d8f6e8bd045c99c3182026) by [@kitten](https://github.com/kitten))
-
-## v0.81.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.82.0-rc.1
-
-### Added
-
-#### Android specific
-
-- **Hermes V1:** Added opt-in to use the new Hermes ([3e9990f860](https://github.com/facebook/react-native/commit/3e9990f860eb9380837ef431ca02def32c4261ad) by [@j-piasecki](https://github.com/j-piasecki))
-
-#### iOS specific
-
-- **Hermes V1:** Added opt-in to use the new Hermes ([e9cdc308b4](https://github.com/facebook/react-native/commit/e9cdc308b4c04753d85757e8877ac00c3c687b95) by [@j-piasecki](https://github.com/j-piasecki))
-
-### Changed
-
-- **Hermes V1:** Changed the source of hermesc binary to be an npm package ([2e0bd13a25](https://github.com/facebook/react-native/commit/2e0bd13a2533fe7ab64125a95b9215b806018c6e) by [@j-piasecki](https://github.com/j-piasecki))
-
-### Deprecated
-
-- **APIs:** Deprecate legacy javascript react native apis ([e7aeea26bd](https://github.com/facebook/react-native/commit/e7aeea26bde6e9cda0a3a0a55fc2a0421fb0c0e5) by [@RSNara](https://github.com/RSNara))
-
-### Fixed
-
-#### Android specific
-
-- **Build From Source:** Fix build from source due to missing folder error on Gradle 9.0 ([9fbce3eff1](https://github.com/facebook/react-native/commit/9fbce3eff18060f16e796badc415ba733ede19af) by [@cortinico](https://github.com/cortinico))
-
-#### iOS specific
-
-- **RCTAlertController:** Simplify RCTAlertController, don't create additional UIWindow ([05c4321b19](https://github.com/facebook/react-native/commit/05c4321b194c3d0e146b6085bcaccc75acd3fd67) by [@okwasniewski](https://github.com/okwasniewski))
-- **Prebuild:** Fix Node scripts related to prebuilt tarball extraction for paths containing whitespaces ([9731e8ebc5](https://github.com/facebook/react-native/commit/9731e8ebc5ea87526a91b9903172639e062cd920) by [@kitten](https://github.com/kitten))
-- **Prebuild:** Use autolinking-generated react-native-config output in second step of cocoapods linking that generates artifacts and generated source ([f170db412b](https://github.com/facebook/react-native/commit/f170db412b3ab46fd0894d5d66431d9c230cd3a8) by [@kitten](https://github.com/kitten))
-
 ## v0.82.0-rc.0
 
 ### Breaking
@@ -114,7 +10,6 @@
 - **Error Handling:** Unhandled promises are now handled by ExceptionsManager.handleException, instead of being swallowed as Logbox Warnings. ([c4082c9ce2](https://github.com/facebook/react-native/commit/c4082c9ce208a324c2d011823ca2ba432411aafc) by [@krystofwoldrich](https://github.com/krystofwoldrich))
 - **`shouldEmitW3CPointerEvents`:** Migrate `shouldPressibilityUseW3CPointerEventsForHover` to common private feature flags and remove `shouldEmitW3CPointerEvents` flag. ([fb4587780e](https://github.com/facebook/react-native/commit/fb4587780e8d6111139d73598a9a26ff392dee28) by [@coado](https://github.com/coado))
 - **TurboModuleUtils:** Remove unused ReactCommon/TurboModuleUtils functions #deepCopyJSIObject and #deepCopyJSIArray ([ead669ade3](https://github.com/facebook/react-native/commit/ead669ade31ee703c407f96c0ce98d8f2991bdc8) by [@christophpurrer](https://github.com/christophpurrer))
-- **TurboModules:** Delete old location of CallbackWrapper.h / LongLivedObject.h by ([cb94e71](https://github.com/facebook/react-native/commit/cb94e71845259ae7fa823eb4d21cde74fccd7435) [@christophpurrer](https://github.com/christophpurrer))
 
 #### Android specific
 
@@ -129,7 +24,7 @@
 
 ### Added
 
-- **Animated:** `Animated.CompositeAnimation` is now exposed when using `"react-native-strict-api"` ([024d25794a](https://github.com/facebook/react-native/commit/024d25794a51c94c877c1dfa115a82ebbf559614) by [@huntie](https://github.com/huntie))
+- **Animated:** `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:** 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))
@@ -166,7 +61,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))

build.gradle.kts

@@ -128,14 +128,13 @@ if (project.findProperty("react.internal.useHermesNightly")?.toString()?.toBoole
 
       That's fine for local development, but you should not commit this change.
       ********************************************************************************
-      """
+  """
           .trimIndent()
   )
   allprojects {
     configurations.all {
       resolutionStrategy.dependencySubstitution {
         substitute(project(":packages:react-native:ReactAndroid:hermes-engine"))
-            // TODO: T237406039 update coordinates
             .using(module("com.facebook.react:hermes-android:0.+"))
             .because("Users opted to use hermes from nightly")
       }

flow-typed/environment/node.js

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

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.83.0-main",
-    "@react-native/metro-config": "0.83.0-main",
+    "@react-native/metro-babel-transformer": "0.82.0-main",
+    "@react-native/metro-config": "0.82.0-main",
     "@tsconfig/node22": "22.0.2",
     "@types/react": "^19.1.0",
     "@typescript-eslint/parser": "^8.36.0",
@@ -86,7 +86,7 @@
     "eslint-plugin-relay": "^1.8.3",
     "fb-dotslash": "0.5.8",
     "flow-api-translator": "0.32.0",
-    "flow-bin": "^0.287.0",
+    "flow-bin": "^0.281.0",
     "glob": "^7.1.1",
     "hermes-eslint": "0.32.0",
     "hermes-transform": "0.32.0",
@@ -101,8 +101,8 @@
     "markdownlint-cli2": "^0.17.2",
     "markdownlint-rule-relative-links": "^3.0.0",
     "memfs": "^4.38.2",
-    "metro-babel-register": "^0.83.3",
-    "metro-transform-plugins": "^0.83.3",
+    "metro-babel-register": "^0.83.1",
+    "metro-transform-plugins": "^0.83.1",
     "micromatch": "^4.0.4",
     "node-fetch": "^2.2.0",
     "nullthrows": "^1.1.1",
@@ -117,7 +117,7 @@
     "temp-dir": "^2.0.0",
     "tinybench": "^4.1.0",
     "typescript": "5.8.3",
-    "ws": "^7.5.10"
+    "ws": "^6.2.3"
   },
   "resolutions": {
     "eslint-plugin-react-hooks": "6.1.0-canary-12bc60f5-20250613",

packages/assets/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/assets-registry",
-  "version": "0.83.0-main",
+  "version": "0.82.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.83.0-main",
+  "version": "0.82.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.83.0-main"
+    "@react-native/codegen": "0.82.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.83.0-main",
+  "version": "0.82.0-main",
   "description": "Core CLI commands for React Native",
   "keywords": [
     "react-native",
@@ -22,16 +22,16 @@
     "dist"
   ],
   "dependencies": {
-    "@react-native/dev-middleware": "0.83.0-main",
+    "@react-native/dev-middleware": "0.82.0-main",
     "debug": "^4.4.0",
     "invariant": "^2.2.4",
-    "metro": "^0.83.3",
-    "metro-config": "^0.83.3",
-    "metro-core": "^0.83.3",
+    "metro": "^0.83.1",
+    "metro-config": "^0.83.1",
+    "metro-core": "^0.83.1",
     "semver": "^7.1.3"
   },
   "devDependencies": {
-    "metro-resolver": "^0.83.3"
+    "metro-resolver": "^0.83.1"
   },
   "peerDependencies": {
     "@react-native-community/cli": "*",

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

@@ -119,6 +119,7 @@ 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.83.0-main",
+  "version": "0.82.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<<e0cc45c5c3854d0d3013f1c735e804b8>>
-Git revision: 8cce39003f66f66a8fb4c0e581a2b5046cf9c1d1
+@generated SignedSource<<b6a779e724ecce5e727ee674dc20f809>>
+Git revision: e87564a24cf233c60aaebee8c418ec85724f7214
 Built with --nohooks: false
 Is local checkout: false
 Remote URL: https://github.com/facebook/react-native-devtools-frontend

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

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

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

@@ -983,7 +983,7 @@ import*as e from"../../../services/trace_bounds/trace_bounds.js";import*as t fro
 
         <p class="tooltip">${Ai(Oi.feedbackTooltip)}</p>
       </div>
-    `,n=s.Directives.repeat([i],(()=>this.#ve),(e=>e));s.render(n,this.#e,{host:this})}}customElements.define("devtools-performance-sidebar-insights",Ui);var Bi=Object.freeze({__proto__:null,SidebarInsightsTab:Ui});class qi extends Event{removedAnnotation;static eventName="removeannotation";constructor(e){super(qi.eventName,{bubbles:!0,composed:!0}),this.removedAnnotation=e}}class Vi extends Event{annotation;static eventName="revealannotation";constructor(e){super(Vi.eventName,{bubbles:!0,composed:!0}),this.annotation=e}}class ji extends r.Widget.VBox{#ri=new r.TabbedPane.TabbedPane;#tn=new Wi;#in=new Ki;#nn=a.Settings.Settings.instance().createSetting("timeline-user-has-opened-sidebar-once",!1);userHasOpenedSidebarOnce(){return this.#nn.get()}constructor(){super(),this.setMinimumSize(170,0);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`
+    `,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`
           <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.83.0-main",
+  "version": "0.82.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<<8b06371489dc8b79c23cbf095568c91a>>
+// @generated SignedSource<<e93d55b5e28943e44271f5d3738083e0>>
 
 
 {
     "name": "React Native DevTools",
     "platforms": {
         "linux-aarch64": {
-            "size": 116051181,
+            "size": 116060647,
             "hash": "sha256",
-            "digest": "a6060e1291f9ee7e9feecd511012c041ed2a65c6df6f8ab5aca4d96adbbc9921",
+            "digest": "4352f1c9848ca919101ec628bd08b87a72a828d1ab55fa43a02098329fa452fa",
             "providers": [
                 {
                     "type": "http",
-                    "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"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQM24LW0nPZRk0ypuIG9prz_72YjBJNcVlGSIEpO4zdlLXgw4dFNodH7MKg9eKNTnx7wrVDDBNACrnEPt_OfXOjZyZsV9Oaqu0-vNFRdlEyis4YqmpqGLtz3LvD-9R6fzcWxJI9zrhdPvOvlXP-3Syt1UNITaxXDVqIwAAYpCaAh0oLpupAFCc2yvYw"
                 }
             ],
             "format": "tar.gz",
             "path": "React Native DevTools-linux-arm64/React Native DevTools"
         },
         "linux-x86_64": {
-            "size": 115927343,
+            "size": 115930333,
             "hash": "sha256",
-            "digest": "354f6550617d0c6b4bb4478ad085d4efe3671ba9a1b78d90d9bfc003a523cb6d",
+            "digest": "11c7b07942928a6301b07fbf2bc77ce1229b2a52891f23541cdd9858b5250e64",
             "providers": [
                 {
                     "type": "http",
-                    "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"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQNDwm7HZRhtNxHqMr1FfSb0afHFGrn1OHxH0gOiggrLrht9QRUgJ3GG5jj7huhQzMRogE-LCMsnxh1ioOZks-YYX4KRt6Kj1-whdWsGFc7lBhPOpk1ssbYFGN1NNyuyFRmH-3nCY3lBC4AmbCUkbDTUeCi9DidCtJeyc73CZJEu7M62rIzxR2yV"
                 }
             ],
             "format": "tar.gz",
             "path": "React Native DevTools-linux-x64/React Native DevTools"
         },
         "macos-aarch64": {
-            "size": 110891048,
+            "size": 110891041,
             "hash": "sha256",
-            "digest": "df41cfce9bc977ef4fdc66c3c892c0eedee5b07aa618550308157c51b8e75561",
+            "digest": "3cbe8b1b3d17e433347f1601435bb9a6cb758528a5c176a66fc52d9977223175",
             "providers": [
                 {
                     "type": "http",
-                    "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"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQOmC2cqqSv4OrSJKJroYVg_NE8OE4O73AXqY7wXiYqiWQVkDt0Xnyw3ZeUpQT_Qb0-OoT5F8REKoFrB6eqwat8Ovkyina30peYTTwNUzmwnnGQEg7J0fOHNxLF4dkmU1FagXtsoWgex4dKgsK_VpcMsHj3Vp7diomkYvWBVTf_gPVEseYSN9oKq92qa"
                 }
             ],
             "format": "tar.gz",
             "path": "React Native DevTools.app/Contents/MacOS/React Native DevTools"
         },
         "macos-x86_64": {
-            "size": 117777930,
+            "size": 117766158,
             "hash": "sha256",
-            "digest": "96805c51623a163b1d94b501e2e091f403b4c3575063bd7363f8e1550cda8dc5",
+            "digest": "6fb79bc2ba3008401b4c9c128248657b95b98581ccde60f8fadb622163779775",
             "providers": [
                 {
                     "type": "http",
-                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQNbF-vba13QuctGdSckSWSApEqUne0w8vGceEm5u9VNYqHzwaZu6_T0n12Ml7aHuNgAgU0OOxJKUjcr2DVsNEsjcCYwMqCjZys8yF8NfM39OH1YePjHZCw5jinydbhGxhF1zbJ_zKmuOx1FhJtzCD3CUbLSea7fuhPh6ytLUIu3Ctx4aFQLFtbJZQ"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQMMtGn-YGdfLfTVWC8zbQkQx65Asq6iArKt1t__cjZ8UY_s6-sX5XBHr8k1SaexAO21dFZENQVZ1jW_wn_gJ9ENvosQDG1KfWMViKsHli0xRzZ1HVsgPIj_KVXe907QZwwtJf2XhgH0HT8dfH-AQdDcd0_TB5DFUwOsHzhH0nBrHet7YFkbJtPTaA"
                 }
             ],
             "format": "tar.gz",
             "path": "React Native DevTools.app/Contents/MacOS/React Native DevTools"
         },
         "windows-x86_64": {
-            "size": 125533589,
+            "size": 125527537,
             "hash": "sha256",
-            "digest": "7f560e6d68b4b917c53ba0518a778a20e267cce55474ad972d345b2738746a52",
+            "digest": "579a5b0944c51c3b1b541ad5af66c1ffedf93cae2a891ecdf88cb7219fd9b096",
             "providers": [
                 {
                     "type": "http",
-                    "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"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQOQ3E8lBXqdVHbDPyVb5AOQMrDWjFrFV8fnLLBsygQvLWdpu6ixyG9PgWdwpi5jM-XcDdCHkhBdhaq-5dwT_tgRWKCAMsEBoAIUk0Xg77mGyHG2VF7bNfQ2qFBMuObrsTmrKy1nJ-UFDDm29pJD4GkFQW5NesiBwndJj8t3B8Ur8cczh_XR8rF5"
                 }
             ],
             "format": "tar.gz",

packages/debugger-shell/package.json

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

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

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

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

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

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

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

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

@@ -30,7 +30,6 @@ 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.
@@ -38,13 +37,9 @@ async function unstable_spawnDebuggerShellWithArgs(
     // continue to run normally.
     mode?: 'syncThenExit' | 'detached',
     flavor?: DebuggerShellFlavor,
-    prebuiltBinaryPath?: string,
   }> = {},
 ): Promise<void> {
-  const [binaryPath, baseArgs] = getShellBinaryAndArgs(
-    flavor,
-    prebuiltBinaryPath,
-  );
+  const [binaryPath, baseArgs] = getShellBinaryAndArgs(flavor);
 
   return new Promise((resolve, reject) => {
     const child = spawn(binaryPath, [...baseArgs, ...args], {
@@ -114,13 +109,14 @@ 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(
-          prebuiltBinaryPath ?? DEVTOOLS_BINARY_DOTSLASH_FILE,
+          DEVTOOLS_BINARY_DOTSLASH_FILE,
         );
         if (prebuiltResult.code !== 'success') {
           return prebuiltResult;
@@ -132,11 +128,6 @@ 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',
@@ -158,14 +149,10 @@ async function unstable_prepareDebuggerShell(
 
 function getShellBinaryAndArgs(
   flavor: DebuggerShellFlavor,
-  prebuiltBinaryPath: ?string,
 ): [string, Array<string>] {
   switch (flavor) {
     case 'prebuilt':
-      return [
-        require('fb-dotslash'),
-        [prebuiltBinaryPath ?? DEVTOOLS_BINARY_DOTSLASH_FILE],
-      ];
+      return [require('fb-dotslash'), [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.83.0-main",
+  "version": "0.82.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.83.0-main",
-    "@react-native/debugger-shell": "0.83.0-main",
+    "@react-native/debugger-frontend": "0.82.0-main",
+    "@react-native/debugger-shell": "0.82.0-main",
     "chrome-launcher": "^0.15.2",
     "chromium-edge-launcher": "^0.2.0",
     "connect": "^3.6.5",
@@ -33,13 +33,13 @@
     "nullthrows": "^1.1.1",
     "open": "^7.0.3",
     "serve-static": "^1.16.2",
-    "ws": "^7.5.10"
+    "ws": "^6.2.3"
   },
   "engines": {
     "node": ">= 20.19.4"
   },
   "devDependencies": {
-    "@react-native/debugger-shell": "0.83.0-main",
+    "@react-native/debugger-shell": "0.82.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,6 +21,10 @@ 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();
@@ -43,6 +47,7 @@ describe.each(['HTTP', 'HTTPS'])(
 
     const serverRef = withServerForEachTest({
       logger: undefined,
+      projectRoot: __dirname,
       secure: protocol === 'HTTPS',
     });
 
@@ -467,7 +472,14 @@ describe.each(['HTTP', 'HTTPS'])(
         }
       });
 
-      test('throws when attempting to pass a filesystem url', async () => {
+      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',
+        );
+
         const {device, debugger_} = await createAndConnectTarget(
           serverRef,
           autoCleanup.signal,
@@ -478,7 +490,6 @@ describe.each(['HTTP', 'HTTPS'])(
             vm: 'bar-vm',
           },
         );
-
         try {
           await sendFromTargetToDebugger(device, debugger_, 'page1', {
             method: 'Debugger.scriptParsed',
@@ -489,7 +500,7 @@ describe.each(['HTTP', 'HTTPS'])(
               endLine: 0,
               startColumn: 0,
               endColumn: 0,
-              hash: createHash('sha256').update('').digest('hex'),
+              hash: createHash('sha256').update(fileRealContents).digest('hex'),
             },
           });
           const response = await debugger_.sendAndGetResponse({
@@ -500,15 +511,8 @@ describe.each(['HTTP', 'HTTPS'])(
             },
           });
           expect(response.result).toEqual(
-            expect.objectContaining({
-              error: {
-                message: expect.stringContaining(
-                  'Can\'t parse requested URL "__fixtures__/mock-source-file.txt"',
-                ),
-              },
-            }),
+            expect.objectContaining({scriptSource: fileRealContents}),
           );
-
           // 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,6 +33,7 @@ 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,6 +39,7 @@ describe('inspector proxy device message middleware', () => {
     const createCustomMessageHandler = jest.fn().mockImplementation(() => null);
     const {server} = await createServer({
       logger: undefined,
+      projectRoot: '',
       unstable_customInspectorMessageHandler: createCustomMessageHandler,
     });
 
@@ -82,6 +83,7 @@ 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);
@@ -167,6 +169,7 @@ describe('inspector proxy device message middleware', () => {
 
     const {server} = await createServer({
       logger: undefined,
+      projectRoot: '',
       unstable_customInspectorMessageHandler: createCustomMessageHandler,
     });
 
@@ -228,6 +231,7 @@ describe('inspector proxy device message middleware', () => {
     const handleDeviceMessage = jest.fn();
     const {server} = await createServer({
       logger: undefined,
+      projectRoot: '',
       unstable_customInspectorMessageHandler: () => ({
         handleDeviceMessage,
         handleDebuggerMessage() {},
@@ -260,6 +264,7 @@ describe('inspector proxy device message middleware', () => {
     const handleDeviceMessage = jest.fn();
     const {server} = await createServer({
       logger: undefined,
+      projectRoot: '',
       unstable_customInspectorMessageHandler: () => ({
         handleDeviceMessage,
         handleDebuggerMessage() {},
@@ -299,6 +304,7 @@ describe('inspector proxy device message middleware', () => {
     const handleDebuggerMessage = jest.fn();
     const {server} = await createServer({
       logger: undefined,
+      projectRoot: '',
       unstable_customInspectorMessageHandler: () => ({
         handleDeviceMessage() {},
         handleDebuggerMessage,
@@ -335,6 +341,7 @@ 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,6 +37,7 @@ 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,6 +27,7 @@ jest.useFakeTimers();
 describe('inspector proxy HTTP API', () => {
   const serverRef = withServerForEachTest({
     logger: undefined,
+    projectRoot: '',
   });
   const autoCleanup = withAbortSignalForEachTest();
   afterEach(() => {
@@ -260,6 +261,7 @@ 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,6 +25,7 @@ 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,6 +34,7 @@ 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

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

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

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

packages/dev-middleware/src/createDevMiddleware.js

@@ -24,6 +24,8 @@ 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}`.
@@ -76,6 +78,7 @@ type DevMiddlewareAPI = $ReadOnly<{
 }>;
 
 export default function createDevMiddleware({
+  projectRoot,
   serverBaseUrl,
   logger,
   // $FlowFixMe[incompatible-type]
@@ -93,6 +96,7 @@ export default function createDevMiddleware({
   );
 
   const inspectorProxy = new InspectorProxy(
+    projectRoot,
     serverBaseUrl,
     eventReporter,
     experiments,

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

@@ -28,7 +28,9 @@ 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');
@@ -73,6 +75,7 @@ export type DeviceOptions = $ReadOnly<{
   name: string,
   app: string,
   socket: WS,
+  projectRoot: string,
   eventReporter: ?EventReporter,
   createMessageMiddleware: ?CreateCustomMessageHandlerFn,
   deviceRelativeBaseUrl: URL,
@@ -117,6 +120,9 @@ 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>;
@@ -145,6 +151,7 @@ export default class Device {
     name,
     app,
     socket,
+    projectRoot,
     eventReporter,
     createMessageMiddleware,
     serverRelativeBaseUrl,
@@ -156,6 +163,7 @@ 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
@@ -872,7 +880,7 @@ export default class Device {
         return this.#processDebuggerSetBreakpointByUrl(req, debuggerInfo);
       case 'Debugger.getScriptSource':
         // Sends response to debugger via side-effect
-        void this.#processDebuggerGetScriptSource(req, socket);
+        this.#processDebuggerGetScriptSource(req, socket);
         return null;
       case 'Network.loadNetworkResource':
         // If we're rewriting URLs (to frontend-relative), we don't want to
@@ -957,10 +965,10 @@ export default class Device {
     return processedReq;
   }
 
-  async #processDebuggerGetScriptSource(
+  #processDebuggerGetScriptSource(
     req: CDPRequest<'Debugger.getScriptSource'>,
     socket: WS,
-  ): Promise<void> {
+  ): void {
     const sendSuccessResponse = (scriptSource: string) => {
       const result: {
         scriptSource: string,
@@ -997,23 +1005,33 @@ export default class Device {
     const pathToSource = this.#scriptIdToSourcePathMapping.get(
       req.params.scriptId,
     );
-
-    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)}`,
+    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}`,
+            ),
         );
+      } 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,6 +75,9 @@ 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;
 
@@ -98,6 +101,7 @@ export default class InspectorProxy implements InspectorProxyQueries {
   #eventLoopPerfTracker: EventLoopPerfTracker;
 
   constructor(
+    projectRoot: string,
     serverBaseUrl: string,
     eventReporter: ?EventReporter,
     experiments: Experiments,
@@ -105,6 +109,7 @@ 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;
@@ -350,6 +355,7 @@ export default class InspectorProxy implements InspectorProxyQueries {
           name: deviceName,
           app: appName,
           socket,
+          projectRoot: this.#projectRoot,
           eventReporter: this.#eventReporter,
           createMessageMiddleware: this.#customMessageHandler,
           deviceRelativeBaseUrl,
@@ -366,6 +372,12 @@ 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,
@@ -438,7 +450,7 @@ export default class InspectorProxy implements InspectorProxyQueries {
         );
 
         socket.on('close', (code: number, reason: string) => {
-          debug(
+          this.#logger?.info(
             "Connection closed to device='%s' for app='%s' with code='%s' and reason='%s'.",
             deviceName,
             appName,
@@ -514,7 +526,7 @@ export default class InspectorProxy implements InspectorProxyQueries {
           throw new Error(INTERNAL_ERROR_MESSAGES.UNREGISTERED_DEVICE);
         }
 
-        debug(
+        this.#logger?.info(
           "Connection established to DevTools for app='%s' on device='%s'.",
           device.getApp() || 'unknown',
           device.getName() || 'unknown',
@@ -582,7 +594,7 @@ export default class InspectorProxy implements InspectorProxyQueries {
         });
 
         socket.on('close', (code: number, reason: string) => {
-          debug(
+          this.#logger?.info(
             "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,7 +21,6 @@ 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 =
@@ -191,15 +190,11 @@ export default function openDebuggerMiddleware({
               }
             }
             if (shouldUseStandaloneFuseboxShell) {
-              const windowKey = createHash('sha256')
-                .update(
-                  [
-                    serverBaseUrl,
-                    target.webSocketDebuggerUrl,
-                    target.appId,
-                  ].join('-'),
-                )
-                .digest('hex');
+              const windowKey = [
+                serverBaseUrl,
+                target.webSocketDebuggerUrl,
+                target.appId,
+              ].join('-');
               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.83.0-main",
+  "version": "0.82.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.83.0-main",
+    "@react-native/eslint-plugin": "0.82.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.83.0-main",
+  "version": "0.82.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.83.0-main",
+  "version": "0.82.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.83.0-main",
+    "@react-native/codegen": "0.82.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.83.0-main",
+  "version": "0.82.0-main",
   "description": "Gradle Plugin for React Native",
   "license": "MIT",
   "repository": {

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

@@ -55,8 +55,8 @@ class ReactPlugin : Plugin<Project> {
                 project,
             )
 
-    if (project.rootProject.isHermesV1Enabled) {
-      rootExtension.hermesV1Enabled.set(true)
+    if (project.rootProject.isHermesV1Enabled != rootExtension.hermesV1Enabled.get()) {
+      rootExtension.hermesV1Enabled.set(project.rootProject.isHermesV1Enabled)
     }
 
     // App Only Configuration
@@ -71,11 +71,11 @@ class ReactPlugin : Plugin<Project> {
       project.afterEvaluate {
         val reactNativeDir = extension.reactNativeDir.get().asFile
         val propertiesFile = File(reactNativeDir, "ReactAndroid/gradle.properties")
-        val hermesVersionPropertiesFile =
-            File(reactNativeDir, "sdks/hermes-engine/version.properties")
-        val versionAndGroupStrings =
-            readVersionAndGroupStrings(propertiesFile, hermesVersionPropertiesFile)
-        val hermesV1Enabled = rootExtension.hermesV1Enabled.get()
+        val versionAndGroupStrings = readVersionAndGroupStrings(propertiesFile)
+        val hermesV1Enabled =
+            if (project.rootProject.hasProperty("hermesV1Enabled"))
+                project.rootProject.findProperty("hermesV1Enabled") == "true"
+            else false
         configureDependencies(project, versionAndGroupStrings, hermesV1Enabled)
         configureRepositories(project)
       }

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

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

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

@@ -14,7 +14,6 @@ import com.facebook.react.utils.KotlinStdlibCompatUtils.capitalizeCompat
 import com.facebook.react.utils.NdkConfiguratorUtils.configureJsEnginePackagingOptions
 import com.facebook.react.utils.NdkConfiguratorUtils.configureNewArchPackagingOptions
 import com.facebook.react.utils.ProjectUtils.isHermesEnabled
-import com.facebook.react.utils.ProjectUtils.isHermesV1Enabled
 import com.facebook.react.utils.ProjectUtils.useThirdPartyJSC
 import com.facebook.react.utils.detectedCliFile
 import com.facebook.react.utils.detectedEntryFile
@@ -49,7 +48,6 @@ internal fun Project.configureReactTasks(variant: Variant, config: ReactExtensio
       } else {
         isHermesEnabledInProject
       }
-  val isHermesV1Enabled = project.isHermesV1Enabled || rootProject.isHermesV1Enabled
   val isDebuggableVariant =
       config.debuggableVariants.get().any { it.equals(variant.name, ignoreCase = true) }
   val useThirdPartyJSC = project.useThirdPartyJSC
@@ -80,7 +78,6 @@ internal fun Project.configureReactTasks(variant: Variant, config: ReactExtensio
           task.jsBundleDir.set(jsBundleDir)
           task.resourcesDir.set(resourcesDir)
           task.hermesEnabled.set(isHermesEnabledInThisVariant)
-          task.hermesV1Enabled.set(isHermesV1Enabled)
           task.minifyEnabled.set(!isHermesEnabledInThisVariant)
           task.devEnabled.set(false)
           task.jsIntermediateSourceMapsDir.set(jsIntermediateSourceMapsDir)

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

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

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

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

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

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

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

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

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

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

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

@@ -13,7 +13,7 @@ import com.facebook.react.utils.PropertyUtils.EXCLUSIVE_ENTEPRISE_REPOSITORY
 import com.facebook.react.utils.PropertyUtils.INCLUDE_JITPACK_REPOSITORY
 import com.facebook.react.utils.PropertyUtils.INCLUDE_JITPACK_REPOSITORY_DEFAULT
 import com.facebook.react.utils.PropertyUtils.INTERNAL_HERMES_PUBLISHING_GROUP
-import com.facebook.react.utils.PropertyUtils.INTERNAL_HERMES_V1_VERSION_NAME
+import com.facebook.react.utils.PropertyUtils.INTERNAL_HERMES_VERSION_NAME
 import com.facebook.react.utils.PropertyUtils.INTERNAL_REACT_NATIVE_MAVEN_LOCAL_REPO
 import com.facebook.react.utils.PropertyUtils.INTERNAL_REACT_PUBLISHING_GROUP
 import com.facebook.react.utils.PropertyUtils.INTERNAL_USE_HERMES_NIGHTLY
@@ -31,7 +31,6 @@ internal object DependencyUtils {
   internal data class Coordinates(
       val versionString: String,
       val hermesVersionString: String,
-      val hermesV1VersionString: String,
       val reactGroupString: String = DEFAULT_INTERNAL_REACT_PUBLISHING_GROUP,
       val hermesGroupString: String = DEFAULT_INTERNAL_HERMES_PUBLISHING_GROUP,
   )
@@ -114,12 +113,7 @@ internal object DependencyUtils {
       coordinates: Coordinates,
       hermesV1Enabled: Boolean = false,
   ) {
-    if (
-        coordinates.versionString.isBlank() ||
-            (!hermesV1Enabled && coordinates.hermesVersionString.isBlank()) ||
-            (hermesV1Enabled && coordinates.hermesV1VersionString.isBlank())
-    )
-        return
+    if (coordinates.versionString.isBlank() || coordinates.hermesVersionString.isBlank()) return
     project.rootProject.allprojects { eachProject ->
       eachProject.configurations.all { configuration ->
         // Here we set a dependencySubstitution for both react-native and hermes-engine as those
@@ -139,11 +133,7 @@ internal object DependencyUtils {
           // Contributors only: The hermes-engine version is forced only if the user has
           // not opted into using nightlies for local development.
           configuration.resolutionStrategy.force(
-              // TODO: T237406039 update coordinates
-              if (hermesV1Enabled)
-                  "${coordinates.hermesGroupString}:hermes-android:${coordinates.hermesV1VersionString}"
-              else
-                  "${coordinates.reactGroupString}:hermes-android:${coordinates.hermesVersionString}"
+              "${coordinates.reactGroupString}:hermes-android:${coordinates.versionString}"
           )
         }
       }
@@ -156,11 +146,10 @@ internal object DependencyUtils {
   ): List<Triple<String, String, String>> {
     // TODO: T231755027 update coordinates and versioning
     val dependencySubstitution = mutableListOf<Triple<String, String, String>>()
-    // TODO: T237406039 update coordinates
     val hermesVersionString =
         if (hermesV1Enabled)
-            "${coordinates.hermesGroupString}:hermes-android:${coordinates.hermesV1VersionString}"
-        else "${coordinates.reactGroupString}:hermes-android:${coordinates.hermesVersionString}"
+            "${coordinates.hermesGroupString}:hermes-android:${coordinates.versionString}"
+        else "${coordinates.reactGroupString}:hermes-android:${coordinates.versionString}"
     dependencySubstitution.add(
         Triple(
             "com.facebook.react:react-native",
@@ -183,7 +172,6 @@ internal object DependencyUtils {
               "The react-android dependency was modified to use the correct Maven group.",
           )
       )
-      // TODO: T237406039 update coordinates
       dependencySubstitution.add(
           Triple(
               "com.facebook.react:hermes-android",
@@ -191,22 +179,18 @@ 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
   }
 
-  fun readVersionAndGroupStrings(propertiesFile: File, hermesVersionFile: File): Coordinates {
+  fun readVersionAndGroupStrings(propertiesFile: File): Coordinates {
     val reactAndroidProperties = Properties()
     propertiesFile.inputStream().use { reactAndroidProperties.load(it) }
     val versionStringFromFile = (reactAndroidProperties[INTERNAL_VERSION_NAME] as? String).orEmpty()
+    // TODO: T231755027 update HERMES_VERSION_NAME in gradle.properties to point to the correct
+    // hermes version
+    val hermesVersionStringFromFile =
+        (reactAndroidProperties[INTERNAL_HERMES_VERSION_NAME] as? String).orEmpty()
     // If on a nightly, we need to fetch the -SNAPSHOT artifact from Sonatype.
     val versionString =
         if (versionStringFromFile.startsWith("0.0.0") || "-nightly-" in versionStringFromFile) {
@@ -221,18 +205,9 @@ internal object DependencyUtils {
     val hermesGroupString =
         reactAndroidProperties[INTERNAL_HERMES_PUBLISHING_GROUP] as? String
             ?: DEFAULT_INTERNAL_HERMES_PUBLISHING_GROUP
-    // TODO: T237406039 read both versions from the same file
-    val hermesVersionProperties = Properties()
-    hermesVersionFile.inputStream().use { hermesVersionProperties.load(it) }
-
-    val hermesVersion = versionString
-    val hermesV1Version =
-        (hermesVersionProperties[INTERNAL_HERMES_V1_VERSION_NAME] as? String).orEmpty()
-
     return Coordinates(
         versionString,
-        hermesVersion,
-        hermesV1Version,
+        hermesVersionStringFromFile,
         reactGroupString,
         hermesGroupString,
     )

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()
   )
@@ -153,7 +153,6 @@ internal fun detectOSAwareHermesCommand(
 
   // 3. If Hermes V1 is enabled, use hermes-compiler from npm, otherwise, if the
   // react-native contains a pre-built hermesc, use it.
-  // TODO: T237406039 use hermes-compiler from npm for both
   val hermesCPath = if (hermesV1Enabled) HERMES_COMPILER_NPM_DIR else HERMESC_IN_REACT_NATIVE_DIR
   val prebuiltHermesPath =
       hermesCPath
@@ -242,7 +241,7 @@ internal fun readPackageJsonFile(
   return packageJson?.let { JsonUtils.fromPackageJson(it) }
 }
 
-private const val HERMES_COMPILER_NPM_DIR = "node_modules/hermes-compiler/hermesc/%OS-BIN%/"
+private const val HERMES_COMPILER_NPM_DIR = "node_modules/hermes-compiler/%OS-BIN%/"
 private const val HERMESC_IN_REACT_NATIVE_DIR = "node_modules/react-native/sdks/hermesc/%OS-BIN%/"
 private const val HERMESC_BUILT_FROM_SOURCE_DIR =
     "node_modules/react-native/ReactAndroid/hermes-engine/build/hermes/bin/"

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

@@ -23,7 +23,6 @@ import com.facebook.react.utils.PropertyUtils.SCOPED_USE_THIRD_PARTY_JSC
 import com.facebook.react.utils.PropertyUtils.USE_THIRD_PARTY_JSC
 import org.gradle.api.Project
 import org.gradle.api.file.DirectoryProperty
-import org.jetbrains.kotlin.gradle.plugin.extraProperties
 
 internal object ProjectUtils {
 
@@ -76,11 +75,7 @@ internal object ProjectUtils {
         (project.hasProperty(HERMES_V1_ENABLED) &&
             project.property(HERMES_V1_ENABLED).toString().toBoolean()) ||
             (project.hasProperty(SCOPED_HERMES_V1_ENABLED) &&
-                project.property(SCOPED_HERMES_V1_ENABLED).toString().toBoolean()) ||
-            (project.extraProperties.has(HERMES_V1_ENABLED) &&
-                project.extraProperties.get(HERMES_V1_ENABLED).toString().toBoolean()) ||
-            (project.extraProperties.has(SCOPED_HERMES_V1_ENABLED) &&
-                project.extraProperties.get(SCOPED_HERMES_V1_ENABLED).toString().toBoolean())
+                project.property(SCOPED_HERMES_V1_ENABLED).toString().toBoolean())
 
   internal fun Project.needsCodegenFromPackageJson(rootProperty: DirectoryProperty): Boolean {
     val parsedPackageJson = readPackageJsonFile(this, rootProperty)

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

@@ -79,10 +79,6 @@ object PropertyUtils {
 
   /** Internal property used to control the version name of React Native */
   const val INTERNAL_VERSION_NAME = "VERSION_NAME"
-
-  /**
-   * Internal property, shared with iOS, used to control the version name of Hermes Engine. This is
-   * stored in sdks/hermes-engine/version.properties
-   */
-  const val INTERNAL_HERMES_V1_VERSION_NAME = "HERMES_V1_VERSION_NAME"
+  /** Internal property used to control the version name of Hermes Engine */
+  const val INTERNAL_HERMES_VERSION_NAME = "HERMES_VERSION_NAME"
 }

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);
-                }
-                
-                if (com.facebook.react.BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-                  DefaultNewArchitectureEntryPoint.load();
-                }
-                
-                if (com.facebook.react.BuildConfig.IS_EDGE_TO_EDGE_ENABLED) {
-                  WindowUtilKt.setEdgeToEdgeFeatureFlagOn();
-                }
-              }
+        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();
+            }
+          }
+        }
+    """
                 .trimIndent()
         )
   }

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

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

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

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

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

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

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

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

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

@@ -271,69 +271,54 @@ class DependencyUtilsTest {
         .isEqualTo(2)
   }
 
+  // TODO: T236767053
+
   @Test
   fun configureDependencies_withEmptyVersion_doesNothing() {
     val project = createProject()
 
-    configureDependencies(project, DependencyUtils.Coordinates("", "", ""))
+    configureDependencies(project, DependencyUtils.Coordinates("", ""))
 
     assertThat(project.configurations.first().resolutionStrategy.forcedModules.isEmpty()).isTrue()
   }
 
   @Test
-  fun configureDependencies_withVersionString_appliesResolutionStrategy_withClassicHermes() {
+  fun configureDependencies_withVersionString_appliesResolutionStrategy() {
     val project = createProject()
 
-    configureDependencies(project, DependencyUtils.Coordinates("1.2.3", "4.5.6", "7.8.9"))
+    configureDependencies(project, DependencyUtils.Coordinates("1.2.3", "1.2.3"))
 
     val forcedModules = project.configurations.first().resolutionStrategy.forcedModules
     assertThat(forcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
         .isTrue()
-    assertThat(forcedModules.any { it.toString() == "com.facebook.react:hermes-android:4.5.6" })
+    assertThat(forcedModules.any { it.toString() == "com.facebook.react:hermes-android:1.2.3" })
         .isTrue()
   }
 
   @Test
-  fun configureDependencies_withVersionString_appliesResolutionStrategy_withHermesV1() {
-    val project = createProject()
-
-    configureDependencies(
-        project,
-        DependencyUtils.Coordinates("1.2.3", "4.5.6", "7.8.9"),
-        hermesV1Enabled = true,
-    )
-
-    val forcedModules = project.configurations.first().resolutionStrategy.forcedModules
-    assertThat(forcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
-        .isTrue()
-    assertThat(forcedModules.any { it.toString() == "com.facebook.hermes:hermes-android:7.8.9" })
-        .isTrue()
-  }
-
-  @Test
-  fun configureDependencies_withVersionString_appliesOnAllProjects_withClassicHermes() {
+  fun configureDependencies_withVersionString_appliesOnAllProjects() {
     val rootProject = ProjectBuilder.builder().build()
     val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
     val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
     appProject.plugins.apply("com.android.application")
     libProject.plugins.apply("com.android.library")
 
-    configureDependencies(appProject, DependencyUtils.Coordinates("1.2.3", "4.5.6", "7.8.9"))
+    configureDependencies(appProject, DependencyUtils.Coordinates("1.2.3", "1.2.3"))
 
     val appForcedModules = appProject.configurations.first().resolutionStrategy.forcedModules
     val libForcedModules = libProject.configurations.first().resolutionStrategy.forcedModules
     assertThat(appForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
         .isTrue()
-    assertThat(appForcedModules.any { it.toString() == "com.facebook.react:hermes-android:4.5.6" })
+    assertThat(appForcedModules.any { it.toString() == "com.facebook.react:hermes-android:1.2.3" })
         .isTrue()
     assertThat(libForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
         .isTrue()
-    assertThat(libForcedModules.any { it.toString() == "com.facebook.react:hermes-android:4.5.6" })
+    assertThat(libForcedModules.any { it.toString() == "com.facebook.react:hermes-android:1.2.3" })
         .isTrue()
   }
 
   @Test
-  fun configureDependencies_withVersionString_appliesOnAllProjects_withHermesV1() {
+  fun configureDependencies_withVersionStringAndGroupString_appliesOnAllProjects() {
     val rootProject = ProjectBuilder.builder().build()
     val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
     val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
@@ -342,93 +327,25 @@ class DependencyUtilsTest {
 
     configureDependencies(
         appProject,
-        DependencyUtils.Coordinates("1.2.3", "4.5.6", "7.8.9"),
-        hermesV1Enabled = true,
-    )
-
-    val appForcedModules = appProject.configurations.first().resolutionStrategy.forcedModules
-    val libForcedModules = libProject.configurations.first().resolutionStrategy.forcedModules
-    assertThat(appForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
-        .isTrue()
-    assertThat(appForcedModules.any { it.toString() == "com.facebook.hermes:hermes-android:7.8.9" })
-        .isTrue()
-    assertThat(libForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
-        .isTrue()
-    assertThat(libForcedModules.any { it.toString() == "com.facebook.hermes:hermes-android:7.8.9" })
-        .isTrue()
-  }
-
-  @Test
-  fun configureDependencies_withVersionStringAndGroupString_appliesOnAllProjects_withClassicHermes() {
-    val rootProject = ProjectBuilder.builder().build()
-    val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
-    val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
-    appProject.plugins.apply("com.android.application")
-    libProject.plugins.apply("com.android.library")
-
-    configureDependencies(
-        appProject,
-        DependencyUtils.Coordinates(
-            "1.2.3",
-            "4.5.6",
-            "7.8.9",
-            "io.github.test",
-            "io.github.test.hermes",
-        ),
+        DependencyUtils.Coordinates("1.2.3", "1.2.3", "io.github.test"),
     )
 
     val appForcedModules = appProject.configurations.first().resolutionStrategy.forcedModules
     val libForcedModules = libProject.configurations.first().resolutionStrategy.forcedModules
     assertThat(appForcedModules.any { it.toString() == "io.github.test:react-android:1.2.3" })
         .isTrue()
-    assertThat(appForcedModules.any { it.toString() == "io.github.test:hermes-android:4.5.6" })
+    assertThat(appForcedModules.any { it.toString() == "io.github.test:hermes-android:1.2.3" })
         .isTrue()
     assertThat(libForcedModules.any { it.toString() == "io.github.test:react-android:1.2.3" })
         .isTrue()
-    assertThat(libForcedModules.any { it.toString() == "io.github.test:hermes-android:4.5.6" })
+    assertThat(libForcedModules.any { it.toString() == "io.github.test:hermes-android:1.2.3" })
         .isTrue()
   }
 
   @Test
-  fun configureDependencies_withVersionStringAndGroupString_appliesOnAllProjects_withHermesV1() {
-    val rootProject = ProjectBuilder.builder().build()
-    val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
-    val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
-    appProject.plugins.apply("com.android.application")
-    libProject.plugins.apply("com.android.library")
-
-    configureDependencies(
-        appProject,
-        DependencyUtils.Coordinates(
-            "1.2.3",
-            "4.5.6",
-            "7.8.9",
-            "io.github.test",
-            "io.github.test.hermes",
-        ),
-        hermesV1Enabled = true,
-    )
-
-    val appForcedModules = appProject.configurations.first().resolutionStrategy.forcedModules
-    val libForcedModules = libProject.configurations.first().resolutionStrategy.forcedModules
-    assertThat(appForcedModules.any { it.toString() == "io.github.test:react-android:1.2.3" })
-        .isTrue()
-    assertThat(
-            appForcedModules.any { it.toString() == "io.github.test.hermes:hermes-android:7.8.9" }
-        )
-        .isTrue()
-    assertThat(libForcedModules.any { it.toString() == "io.github.test:react-android:1.2.3" })
-        .isTrue()
-    assertThat(
-            libForcedModules.any { it.toString() == "io.github.test.hermes:hermes-android:7.8.9" }
-        )
-        .isTrue()
-  }
-
-  @Test
-  fun getDependencySubstitutions_withDefaultGroup_substitutesCorrectly_withClassicHermes() {
+  fun getDependencySubstitutions_withDefaultGroup_substitutesCorrectly() {
     val dependencySubstitutions =
-        getDependencySubstitutions(DependencyUtils.Coordinates("0.42.0", "0.42.0", "0.43.0"))
+        getDependencySubstitutions(DependencyUtils.Coordinates("0.42.0", "0.42.0"))
 
     assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
     assertThat("com.facebook.react:react-android:0.42.0")
@@ -447,40 +364,10 @@ class DependencyUtilsTest {
   }
 
   @Test
-  fun getDependencySubstitutions_withDefaultGroup_substitutesCorrectly_withHermesV1() {
+  fun getDependencySubstitutions_withCustomGroup_substitutesCorrectly() {
     val dependencySubstitutions =
         getDependencySubstitutions(
-            DependencyUtils.Coordinates("0.42.0", "0.42.0", "0.43.0"),
-            hermesV1Enabled = true,
-        )
-
-    assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
-    assertThat("com.facebook.react:react-android:0.42.0")
-        .isEqualTo(dependencySubstitutions[0].second)
-    assertThat(
-            "The react-native artifact was deprecated in favor of react-android due to https://github.com/facebook/react-native/issues/35210."
-        )
-        .isEqualTo(dependencySubstitutions[0].third)
-    assertThat("com.facebook.react:hermes-engine").isEqualTo(dependencySubstitutions[1].first)
-    assertThat("com.facebook.hermes:hermes-android:0.43.0")
-        .isEqualTo(dependencySubstitutions[1].second)
-    assertThat(
-            "The hermes-engine artifact was deprecated in favor of hermes-android due to https://github.com/facebook/react-native/issues/35210."
-        )
-        .isEqualTo(dependencySubstitutions[1].third)
-  }
-
-  @Test
-  fun getDependencySubstitutions_withCustomGroup_substitutesCorrectly_withClassicHermes() {
-    val dependencySubstitutions =
-        getDependencySubstitutions(
-            DependencyUtils.Coordinates(
-                "0.42.0",
-                "0.42.0",
-                "0.43.0",
-                "io.github.test",
-                "io.github.test.hermes",
-            )
+            DependencyUtils.Coordinates("0.42.0", "0.42.0", "io.github.test")
         )
 
     assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
@@ -505,76 +392,22 @@ class DependencyUtilsTest {
         .isEqualTo(dependencySubstitutions[3].third)
   }
 
-  @Test
-  fun getDependencySubstitutions_withCustomGroup_substitutesCorrectly_withHermesV1() {
-    val dependencySubstitutions =
-        getDependencySubstitutions(
-            DependencyUtils.Coordinates(
-                "0.42.0",
-                "0.42.0",
-                "0.43.0",
-                "io.github.test",
-                "io.github.test.hermes",
-            ),
-            hermesV1Enabled = true,
-        )
-
-    assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
-    assertThat("io.github.test:react-android:0.42.0").isEqualTo(dependencySubstitutions[0].second)
-    assertThat(
-            "The react-native artifact was deprecated in favor of react-android due to https://github.com/facebook/react-native/issues/35210."
-        )
-        .isEqualTo(dependencySubstitutions[0].third)
-    assertThat("com.facebook.react:hermes-engine").isEqualTo(dependencySubstitutions[1].first)
-    assertThat("io.github.test.hermes:hermes-android:0.43.0")
-        .isEqualTo(dependencySubstitutions[1].second)
-    assertThat(
-            "The hermes-engine artifact was deprecated in favor of hermes-android due to https://github.com/facebook/react-native/issues/35210."
-        )
-        .isEqualTo(dependencySubstitutions[1].third)
-    assertThat("com.facebook.react:react-android").isEqualTo(dependencySubstitutions[2].first)
-    assertThat("io.github.test:react-android:0.42.0").isEqualTo(dependencySubstitutions[2].second)
-    assertThat("The react-android dependency was modified to use the correct Maven group.")
-        .isEqualTo(dependencySubstitutions[2].third)
-    assertThat("com.facebook.react:hermes-android").isEqualTo(dependencySubstitutions[3].first)
-    assertThat("io.github.test.hermes:hermes-android:0.43.0")
-        .isEqualTo(dependencySubstitutions[3].second)
-    assertThat("The hermes-android dependency was modified to use the correct Maven group.")
-        .isEqualTo(dependencySubstitutions[3].third)
-  }
-
   @Test
   fun readVersionString_withCorrectVersionString_returnsIt() {
     val propertiesFile =
         tempFolder.newFile("gradle.properties").apply {
           writeText(
               """
-              VERSION_NAME=1000.0.0
-              ANOTHER_PROPERTY=true
-              """
+        VERSION_NAME=1000.0.0
+        ANOTHER_PROPERTY=true
+      """
                   .trimIndent()
           )
         }
 
-    val hermesVersionFile =
-        tempFolder.newFile("version.properties").apply {
-          writeText(
-              """
-              HERMES_V1_VERSION_NAME=1000.0.0
-              ANOTHER_PROPERTY=true
-              """
-                  .trimIndent()
-          )
-        }
-
-    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
-    val versionString = strings.versionString
-    val hermesVersionString = strings.hermesVersionString
-    val hermesV1VersionString = strings.hermesV1VersionString
+    val versionString = readVersionAndGroupStrings(propertiesFile).versionString
 
     assertThat(versionString).isEqualTo("1000.0.0")
-    assertThat(hermesVersionString).isEqualTo("1000.0.0")
-    assertThat(hermesV1VersionString).isEqualTo("1000.0.0")
   }
 
   @Test
@@ -583,34 +416,16 @@ 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
+        ANOTHER_PROPERTY=true
+      """
                   .trimIndent()
           )
         }
 
-    val hermesVersionFile =
-        tempFolder.newFile("version.properties").apply {
-          writeText(
-              """
-              HERMES_V1_VERSION_NAME=250829098.0.0-stable
-              ANOTHER_PROPERTY=true
-              """
-                  .trimIndent()
-          )
-        }
-
-    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
-    val versionString = strings.versionString
-    val hermesVersionString = strings.hermesVersionString
-    val hermesV1VersionString = strings.hermesV1VersionString
+    val versionString = readVersionAndGroupStrings(propertiesFile).versionString
 
     assertThat(versionString).isEqualTo("0.0.0-20221101-2019-cfe811ab1-SNAPSHOT")
-    assertThat(hermesVersionString).isEqualTo("0.0.0-20221101-2019-cfe811ab1-SNAPSHOT")
-    assertThat(hermesV1VersionString).isEqualTo("250829098.0.0-stable")
   }
 
   @Test
@@ -619,29 +434,14 @@ class DependencyUtilsTest {
         tempFolder.newFile("gradle.properties").apply {
           writeText(
               """
-              ANOTHER_PROPERTY=true
-              """
+        ANOTHER_PROPERTY=true
+      """
                   .trimIndent()
           )
         }
 
-    val hermesVersionFile =
-        tempFolder.newFile("version.properties").apply {
-          writeText(
-              """
-              ANOTHER_PROPERTY=true
-              """
-                  .trimIndent()
-          )
-        }
-
-    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
-    val versionString = strings.versionString
-    val hermesVersionString = strings.hermesVersionString
-    val hermesV1VersionString = strings.hermesV1VersionString
+    val versionString = readVersionAndGroupStrings(propertiesFile).versionString
     assertThat(versionString).isEqualTo("")
-    assertThat(hermesVersionString).isEqualTo("")
-    assertThat(hermesV1VersionString).isEqualTo("")
   }
 
   @Test
@@ -650,31 +450,15 @@ class DependencyUtilsTest {
         tempFolder.newFile("gradle.properties").apply {
           writeText(
               """
-              VERSION_NAME=
-              ANOTHER_PROPERTY=true
-              """
+        VERSION_NAME=
+        ANOTHER_PROPERTY=true
+      """
                   .trimIndent()
           )
         }
 
-    val hermesVersionFile =
-        tempFolder.newFile("version.properties").apply {
-          writeText(
-              """
-              HERMES_V1_VERSION_NAME=
-              ANOTHER_PROPERTY=true
-              """
-                  .trimIndent()
-          )
-        }
-
-    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
-    val versionString = strings.versionString
-    val hermesVersionString = strings.hermesVersionString
-    val hermesV1VersionString = strings.hermesV1VersionString
+    val versionString = readVersionAndGroupStrings(propertiesFile).versionString
     assertThat(versionString).isEqualTo("")
-    assertThat(hermesVersionString).isEqualTo("")
-    assertThat(hermesV1VersionString).isEqualTo("")
   }
 
   @Test
@@ -683,31 +467,16 @@ 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
+        ANOTHER_PROPERTY=true
+      """
                   .trimIndent()
           )
         }
 
-    val hermesVersionFile =
-        tempFolder.newFile("version.properties").apply {
-          writeText(
-              """
-              HERMES_V1_VERSION_NAME=
-              ANOTHER_PROPERTY=true
-              """
-                  .trimIndent()
-          )
-        }
+    val groupString = readVersionAndGroupStrings(propertiesFile).reactGroupString
 
-    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
-    val reactGroupString = strings.reactGroupString
-    val hermesGroupString = strings.hermesGroupString
-
-    assertThat(reactGroupString).isEqualTo("io.github.test")
-    assertThat(hermesGroupString).isEqualTo("io.github.test")
+    assertThat(groupString).isEqualTo("io.github.test")
   }
 
   @Test
@@ -716,29 +485,15 @@ class DependencyUtilsTest {
         tempFolder.newFile("gradle.properties").apply {
           writeText(
               """
-              ANOTHER_PROPERTY=true
-              """
+        ANOTHER_PROPERTY=true
+      """
                   .trimIndent()
           )
         }
 
-    val hermesVersionFile =
-        tempFolder.newFile("version.properties").apply {
-          writeText(
-              """
-              HERMES_V1_VERSION_NAME=
-              ANOTHER_PROPERTY=true
-              """
-                  .trimIndent()
-          )
-        }
+    val groupString = readVersionAndGroupStrings(propertiesFile).reactGroupString
 
-    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
-    val reactGroupString = strings.reactGroupString
-    val hermesGroupString = strings.hermesGroupString
-
-    assertThat(reactGroupString).isEqualTo("com.facebook.react")
-    assertThat(hermesGroupString).isEqualTo("com.facebook.hermes")
+    assertThat(groupString).isEqualTo("com.facebook.react")
   }
 
   @Test

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/hermesc/osx-bin/")
-    val expected = tempFolder.newFile("node_modules/hermes-compiler/hermesc/osx-bin/hermesc")
+    tempFolder.newFolder("node_modules/hermes-compiler/osx-bin/")
+    val expected = tempFolder.newFile("node_modules/hermes-compiler/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.83.0-main",
+  "version": "0.82.0-main",
   "description": "Metro configuration for React Native.",
   "license": "MIT",
   "repository": {
@@ -26,9 +26,9 @@
     "dist"
   ],
   "dependencies": {
-    "@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"
+    "@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"
   }
 }

packages/new-app-screen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/new-app-screen",
-  "version": "0.83.0-main",
+  "version": "0.82.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.83.0-main",
+  "version": "0.82.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.83.0-main",
+  "version": "0.82.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.83.0-main",
+  "version": "0.82.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.83.0-main",
+    "@react-native/babel-plugin-codegen": "0.82.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/index.js

@@ -10,41 +10,11 @@
 
 '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.83.0-main",
+  "version": "0.82.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.83.0-main",
+    "@react-native/babel-preset": "0.82.0-main",
     "hermes-parser": "0.32.0",
     "nullthrows": "^1.1.1"
   },

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

@@ -23,14 +23,13 @@ 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 = [getPresetCacheKey(), fs.readFileSync(__filename)];
+const cacheKeyParts = [fs.readFileSync(__filename)];
 
 // TS detection conditions copied from @react-native/babel-preset
 function isTypeScriptSource(fileName /*: string */) {

packages/react-native-codegen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/codegen",
-  "version": "0.83.0-main",
+  "version": "0.82.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: {} /*:: as SchemaType['modules'] */},
+    {modules: {}},
   );
 
   return {

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

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

packages/react-native-compatibility-check/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/compatibility-check",
-  "version": "0.83.0-main",
+  "version": "0.82.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.83.0-main"
+    "@react-native/codegen": "0.82.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.83.0-main",
+  "version": "0.82.0-main",
   "description": "PopupMenu for the Android platform",
   "main": "index.js",
   "files": [
@@ -21,7 +21,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@react-native/codegen": "0.83.0-main"
+    "@react-native/codegen": "0.82.0-main"
   },
   "peerDependencies": {
     "@types/react": "^19.1.0",

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

@@ -873,6 +873,56 @@ 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

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

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

@@ -14,10 +14,9 @@ import Image from '../../Image/Image';
 import createAnimatedComponent from '../createAnimatedComponent';
 import * as React from 'react';
 
-export default (createAnimatedComponent<
-  $FlowFixMe,
-  React.ElementRef<typeof Image>,
->((Image: $FlowFixMe)): AnimatedComponentType<
+export default (createAnimatedComponent(
+  (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) as $FlowFixMe as component<
+export default (createAnimatedComponent(SectionList): component<
   // $FlowExpectedError[unclear-type]
   ItemT = any,
   // $FlowExpectedError[unclear-type]
@@ -23,4 +23,4 @@ export default createAnimatedComponent(SectionList) as $FlowFixMe as component<
 >(
   ref?: React.RefSetter<SectionList<ItemT, SectionT>>,
   ...props: AnimatedProps<SectionListProps<ItemT, SectionT>>
-);
+));

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

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