Fix CQS signal readability-implicit-bool-conversion in xplat/js/react-native-github/packages (#53594)

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

Reviewed By: rshest

Differential Revision: D81570847

.flowconfig

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

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

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

.github/workflow-scripts/createDraftRelease.js

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

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

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

.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 \
@@ -383,8 +379,7 @@ jobs:
     runs-on: 8-core-ubuntu
     needs: [set_release_type]
     container:
-      # Version is pinned to v18.0 to unblock `run_fantom_tests` - see https://github.com/react-native-community/docker-android/pull/242#issuecomment-3280029122
-      image: reactnativecommunity/react-native-android:v18.0
+      image: reactnativecommunity/react-native-android:latest
       env:
         TERM: "dumb"
         GRADLE_OPTS: "-Dorg.gradle.daemon=false"
@@ -599,7 +594,6 @@ jobs:
 
   test_js:
     runs-on: ubuntu-latest
-    if: github.repository == 'facebook/react-native'
     strategy:
       fail-fast: false
       matrix:
@@ -614,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

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

CHANGELOG.md

@@ -1,61 +1,5 @@
 # Changelog
 
-## v0.81.3
-
-### Fixed
-
-#### iOS specific
-
-- Reverted "Use autolinking-generated react-native-config output in second step of cocoapods linking that generates artifacts and generated source" ([537e3ad930](https://github.com/facebook/react-native/commit/537e3ad93041c0cef959f0d20586fe97818900a6) by [@gabrieldonadel](https://github.com/gabrieldonadel))
-
-## v0.81.2
-
-### Added
-
-#### Android specific
-
-- Create a debugOptimized buildType for Android ([5e3edafec6](https://github.com/facebook/react-native/commit/5e3edafec6c69558521061dced7a6bcd046576b0) by [@cortinico](https://github.com/cortinico))
-- Add `useNativeEqualsInNativeReadableArrayAndroid` and `useNativeTransformHelperAndroid` feature flag to the experimental channel. This should alleviate some of the perf issue users are seeing on Android + Reanimated + NewArch on 0.81([a346096da8](https://github.com/facebook/react-native/commit/a346096da81fccf5fbc82d83bfc128695e6ec3a5) by [@cortinico](https://github.com/cortinico))
-
-### Fixed
-
-#### iOS specific
-
-- Fix Node scripts related to prebuilt tarball extraction for paths containing whitespaces ([366f2ad505](https://github.com/facebook/react-native/commit/366f2ad5057ffecc1f5b211f6aae29567ae6b7e5) by [@kitten](https://github.com/kitten))
-- Use autolinking-generated react-native-config output in second step of cocoapods linking that generates artifacts and generated source ([a2eb29e5e7](https://github.com/facebook/react-native/commit/a2eb29e5e7aef8bbdf4c647c8467b5292b013b20) by [@kitten](https://github.com/kitten))
-
-## v0.82.0-rc.1
-
-### Added
-
-#### Android specific
-
-- **Hermes V1:** Added opt-in to use the new Hermes ([3e9990f860](https://github.com/facebook/react-native/commit/3e9990f860eb9380837ef431ca02def32c4261ad) by [@j-piasecki](https://github.com/j-piasecki))
-
-#### iOS specific
-
-- **Hermes V1:** Added opt-in to use the new Hermes ([e9cdc308b4](https://github.com/facebook/react-native/commit/e9cdc308b4c04753d85757e8877ac00c3c687b95) by [@j-piasecki](https://github.com/j-piasecki))
-
-### Changed
-
-- **Hermes V1:** Changed the source of hermesc binary to be an npm package ([2e0bd13a25](https://github.com/facebook/react-native/commit/2e0bd13a2533fe7ab64125a95b9215b806018c6e) by [@j-piasecki](https://github.com/j-piasecki))
-
-### Deprecated
-
-- **APIs:** Deprecate legacy javascript react native apis ([e7aeea26bd](https://github.com/facebook/react-native/commit/e7aeea26bde6e9cda0a3a0a55fc2a0421fb0c0e5) by [@RSNara](https://github.com/RSNara))
-
-### Fixed
-
-#### Android specific
-
-- **Build From Source:** Fix build from source due to missing folder error on Gradle 9.0 ([9fbce3eff1](https://github.com/facebook/react-native/commit/9fbce3eff18060f16e796badc415ba733ede19af) by [@cortinico](https://github.com/cortinico))
-
-#### iOS specific
-
-- **RCTAlertController:** Simplify RCTAlertController, don't create additional UIWindow ([05c4321b19](https://github.com/facebook/react-native/commit/05c4321b194c3d0e146b6085bcaccc75acd3fd67) by [@okwasniewski](https://github.com/okwasniewski))
-- **Prebuild:** Fix Node scripts related to prebuilt tarball extraction for paths containing whitespaces ([9731e8ebc5](https://github.com/facebook/react-native/commit/9731e8ebc5ea87526a91b9903172639e062cd920) by [@kitten](https://github.com/kitten))
-- **Prebuild:** Use autolinking-generated react-native-config output in second step of cocoapods linking that generates artifacts and generated source ([f170db412b](https://github.com/facebook/react-native/commit/f170db412b3ab46fd0894d5d66431d9c230cd3a8) by [@kitten](https://github.com/kitten))
-
 ## v0.82.0-rc.0
 
 ### Breaking

README.md

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

build.gradle.kts

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

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

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

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

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

flow-typed/npm/electron-store_v8.x.x.js

@@ -1,41 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow
- * @format
- */
-
-declare module 'electron-store' {
-  declare export type Schema = any;
-
-  declare export type Options = {
-    +name?: string,
-    defaults?: Object,
-    schema?: any,
-    migrations?: any,
-    beforeEachMigration?: any,
-    clearInvalidConfig?: boolean,
-    serialize?: any,
-    deserialize?: any,
-    accessPropertiesByDotNotation?: boolean,
-    watch?: boolean,
-    encryptionKey?: string | Buffer | $ReadOnlyArray<number>,
-    ...
-  };
-
-  declare class ElectronStore {
-    constructor(options?: Options): this;
-    get(key: string): any;
-    get(key: string, defaultValue: any): any;
-    set(key: string, value: any): void;
-    set(object: Object): void;
-    has(key: string): boolean;
-    delete(key: string): void;
-    clear(): void;
-  }
-
-  declare module.exports: Class<ElectronStore>;
-}

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

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

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

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

gradle.properties

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

package.json

@@ -54,16 +54,13 @@
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-flow": "^7.24.7",
     "@electron/packager": "^18.3.6",
-    "@expo/spawn-async": "^1.7.2",
     "@jest/create-cache-key-function": "^29.7.0",
     "@microsoft/api-extractor": "^7.52.2",
-    "@octokit/rest": "^22.0.0",
     "@react-native/metro-babel-transformer": "0.82.0-main",
     "@react-native/metro-config": "0.82.0-main",
     "@tsconfig/node22": "22.0.2",
     "@types/react": "^19.1.0",
     "@typescript-eslint/parser": "^8.36.0",
-    "ansi-regex": "^5.0.0",
     "ansi-styles": "^4.2.1",
     "babel-plugin-minify-dead-code-elimination": "^0.5.2",
     "babel-plugin-syntax-hermes-parser": "0.32.0",
@@ -84,9 +81,8 @@
     "eslint-plugin-react-native": "^4.0.0",
     "eslint-plugin-redundant-undefined": "^0.4.0",
     "eslint-plugin-relay": "^1.8.3",
-    "fb-dotslash": "0.5.8",
     "flow-api-translator": "0.32.0",
-    "flow-bin": "^0.281.0",
+    "flow-bin": "^0.280.0",
     "glob": "^7.1.1",
     "hermes-eslint": "0.32.0",
     "hermes-transform": "0.32.0",
@@ -97,10 +93,9 @@
     "jest-diff": "^29.7.0",
     "jest-junit": "^16.0.0",
     "jest-snapshot": "^29.7.0",
-    "jsonc-parser": "2.2.1",
     "markdownlint-cli2": "^0.17.2",
     "markdownlint-rule-relative-links": "^3.0.0",
-    "memfs": "^4.38.2",
+    "memfs": "^4.7.7",
     "metro-babel-register": "^0.83.1",
     "metro-transform-plugins": "^0.83.1",
     "micromatch": "^4.0.4",
@@ -112,12 +107,12 @@
     "react-test-renderer": "19.1.1",
     "rimraf": "^3.0.2",
     "shelljs": "^0.8.5",
-    "signedsource": "^2.0.0",
+    "signedsource": "^1.0.0",
     "supports-color": "^7.1.0",
     "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/debugger-frontend/BUILD_INFO

@@ -1,5 +1,5 @@
-@generated SignedSource<<0b54f75686e4893a5444839bf621a317>>
-Git revision: 5a792db1225adda206313e9bf751198a1ca7851a
+@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-shell/bin/react-native-devtools

@@ -1,71 +1,71 @@
 #!/usr/bin/env dotslash
 
-// @generated SignedSource<<9df662721aea6e3774a8677e2a6065e4>>
+// @generated SignedSource<<e93d55b5e28943e44271f5d3738083e0>>
 
 
 {
     "name": "React Native DevTools",
     "platforms": {
         "linux-aarch64": {
-            "size": 116056584,
+            "size": 116060647,
             "hash": "sha256",
-            "digest": "fac3912f10e3c373c874be6c4696f11e05cbaa754c116db6ea72189afae5efe6",
+            "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=AQPdlYV_w4y_wxd5Rs8c_F-soLMbY1zwXJjD-JM4TkOtOELyxZGyreTb6dTehp_X6e3qVFZUT05ETRs0MbvqYr4mqdb6dkG9DqNQEVv3TBoHwl7TYSygtHJEs3gXTAtMLYEKW9xXODJlVF-9II7fdTdHU7x7Pyf6NR6S3nv7sKUVD-zKpxF50L2TwUQ"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQM24LW0nPZRk0ypuIG9prz_72YjBJNcVlGSIEpO4zdlLXgw4dFNodH7MKg9eKNTnx7wrVDDBNACrnEPt_OfXOjZyZsV9Oaqu0-vNFRdlEyis4YqmpqGLtz3LvD-9R6fzcWxJI9zrhdPvOvlXP-3Syt1UNITaxXDVqIwAAYpCaAh0oLpupAFCc2yvYw"
                 }
             ],
             "format": "tar.gz",
             "path": "React Native DevTools-linux-arm64/React Native DevTools"
         },
         "linux-x86_64": {
-            "size": 115929093,
+            "size": 115930333,
             "hash": "sha256",
-            "digest": "06bbaeb62ae2e0081d184eba42b9f15be0d0b3f4901142b08a8a1430ff83e722",
+            "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=AQPENbrxrg0RF_TiyxSY_YVYqC1UfRKj_bMfKb3qHUsIhBlya8n3FkbfJqTXTNdqL4riFRulXS5ecXZprtvk_9kao-zY59r3kiTRwobzF0jnjM507_9UOnEHWzG5ZJYzQyOtS3kQmT0HwZabVj9qw38OB9mk-MPVCZIPZay2PRnIThBzpKDoOOP9"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQNDwm7HZRhtNxHqMr1FfSb0afHFGrn1OHxH0gOiggrLrht9QRUgJ3GG5jj7huhQzMRogE-LCMsnxh1ioOZks-YYX4KRt6Kj1-whdWsGFc7lBhPOpk1ssbYFGN1NNyuyFRmH-3nCY3lBC4AmbCUkbDTUeCi9DidCtJeyc73CZJEu7M62rIzxR2yV"
                 }
             ],
             "format": "tar.gz",
             "path": "React Native DevTools-linux-x64/React Native DevTools"
         },
         "macos-aarch64": {
-            "size": 110891603,
+            "size": 110891041,
             "hash": "sha256",
-            "digest": "eeb9cc1399c0c38c429848dbf622f1b46e88d7d97788dcdc4c30a9fcce37705c",
+            "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=AQN9bd7nbXi-uF_MooJEiUL2jJVifMqgQxZ236aqbSdiJe5Uzjud5ANf0LDAl8GDVVRShd6x4B-gsZ-qRowH0qJikoGatQIkBgyzp4i8ors52etGOIIwdAxdNIng5Vtp441j2_N__btkJqlHcMMbbqvO8fg9oeYTlhMpOx3MLLWXIlG7ix5IFUDiYChf"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQOmC2cqqSv4OrSJKJroYVg_NE8OE4O73AXqY7wXiYqiWQVkDt0Xnyw3ZeUpQT_Qb0-OoT5F8REKoFrB6eqwat8Ovkyina30peYTTwNUzmwnnGQEg7J0fOHNxLF4dkmU1FagXtsoWgex4dKgsK_VpcMsHj3Vp7diomkYvWBVTf_gPVEseYSN9oKq92qa"
                 }
             ],
             "format": "tar.gz",
             "path": "React Native DevTools.app/Contents/MacOS/React Native DevTools"
         },
         "macos-x86_64": {
-            "size": 117770388,
+            "size": 117766158,
             "hash": "sha256",
-            "digest": "a65e446e526502b267cbe6800ae031e4e1b5b0aca21412152a66ffe1d3a29410",
+            "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=AQN29ukKLZS48QcCU-gms06YFnG-fxxDfrWTup-Z6KoIAP-QEu3sFzrpqeZz4g-jFsh3o-IIoHJsdbu4a2U7ROjPfWGguGJrPK8fdc3iV67Qw1_VAPU13dm0dI1DbSY50ah05wh43jdBG3LGCAYYJ-W8_mZMC3HqM2v-8KVd-DoPT4hOh1s9CCFgEQ"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=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": 125526370,
+            "size": 125527537,
             "hash": "sha256",
-            "digest": "26b190c0f85249dee91999e020b8fe7ffd5c007458a2103ed3822558861dbe87",
+            "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=AQO0mdIJx1eYiSDJNiAZ2soaeECILayWnvOeiey-fpS4ydDTreAMfwL4QZ5GZo4-AsGwOXCSdF3hBMM2ufnvw6BDFg5UEiTc4DALJu7o6YBBG4wlVZbI-2kkaXd7u8RhBQPjmhsdcX3sDmCGmSr3WK9EkTRKStE2lb6ilOn-969h4dYWekwUUCSX"
+                    "url": "https://scontent.xx.fbcdn.net/mci_ab/uap/?ab_b=m&ab_page=react_native_devtools_binaries&ab_entry=AQOQ3E8lBXqdVHbDPyVb5AOQMrDWjFrFV8fnLLBsygQvLWdpu6ixyG9PgWdwpi5jM-XcDdCHkhBdhaq-5dwT_tgRWKCAMsEBoAIUk0Xg77mGyHG2VF7bNfQ2qFBMuObrsTmrKy1nJ-UFDDm29pJD4GkFQW5NesiBwndJj8t3B8Ur8cczh_XR8rF5"
                 }
             ],
             "format": "tar.gz",

packages/debugger-shell/package.json

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

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

@@ -9,12 +9,10 @@
  */
 
 // $FlowFixMe[unclear-type] We have no Flow types for the Electron API.
-const {BrowserWindow, Menu, app, shell, ipcMain} = require('electron') as any;
-const Store = require('electron-store');
+const {BrowserWindow, app, shell, ipcMain} = require('electron') as any;
 const path = require('path');
 const util = require('util');
 
-const appSettings = new Store();
 const windowMetadata = new WeakMap<
   typeof BrowserWindow,
   $ReadOnly<{
@@ -55,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'),
@@ -69,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.
@@ -96,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/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
@@ -30,7 +31,7 @@ const {
   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

@@ -152,7 +152,11 @@ function getShellBinaryAndArgs(
 ): [string, Array<string>] {
   switch (flavor) {
     case 'prebuilt':
-      return [require('fb-dotslash'), [DEVTOOLS_BINARY_DOTSLASH_FILE]];
+      return [
+        // $FlowFixMe[cannot-resolve-module] fb-dotslash includes Flow types but Flow does not pick them up
+        require('fb-dotslash'),
+        [DEVTOOLS_BINARY_DOTSLASH_FILE],
+      ];
     case 'dev':
       return [
         // NOTE: Internally at Meta, this is aliased to a workspace that is

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

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

packages/dev-middleware/package.json

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

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

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

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

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

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/internal/PrivateReactExtension.kt

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

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

@@ -63,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,7 @@ abstract class BundleHermesCTask : DefaultTask() {
     runCommand(bundleCommand)
 
     if (hermesEnabled.get()) {
-      val detectedHermesCommand =
-          detectOSAwareHermesCommand(root.get().asFile, hermesCommand.get(), hermesV1Enabled.get())
+      val detectedHermesCommand = detectOSAwareHermesCommand(root.get().asFile, hermesCommand.get())
       val bytecodeFile = File("${bundleFile}.hbc")
       val outputSourceMap = resolveOutputSourceMap(bundleAssetFilename)
       val compilerSourceMap = resolveCompilerSourceMap(bundleAssetFilename)

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

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

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

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

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

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

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

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

packages/gradle-plugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tasks/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)

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

@@ -275,160 +275,71 @@ class DependencyUtilsTest {
   fun configureDependencies_withEmptyVersion_doesNothing() {
     val project = createProject()
 
-    configureDependencies(project, DependencyUtils.Coordinates("", "", ""))
+    configureDependencies(project, "")
 
     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, "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, "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()
     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"),
-        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",
-        ),
-    )
+    configureDependencies(appProject, "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() {
-    val dependencySubstitutions =
-        getDependencySubstitutions(DependencyUtils.Coordinates("0.42.0", "0.42.0", "0.43.0"))
+  fun getDependencySubstitutions_withDefaultGroup_substitutesCorrectly() {
+    val dependencySubstitutions = getDependencySubstitutions("0.42.0")
 
     assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
     assertThat("com.facebook.react:react-android:0.42.0")
@@ -447,41 +358,8 @@ class DependencyUtilsTest {
   }
 
   @Test
-  fun getDependencySubstitutions_withDefaultGroup_substitutesCorrectly_withHermesV1() {
-    val dependencySubstitutions =
-        getDependencySubstitutions(
-            DependencyUtils.Coordinates("0.42.0", "0.42.0", "0.43.0"),
-            hermesV1Enabled = true,
-        )
-
-    assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
-    assertThat("com.facebook.react:react-android:0.42.0")
-        .isEqualTo(dependencySubstitutions[0].second)
-    assertThat(
-            "The react-native artifact was deprecated in favor of react-android due to https://github.com/facebook/react-native/issues/35210."
-        )
-        .isEqualTo(dependencySubstitutions[0].third)
-    assertThat("com.facebook.react:hermes-engine").isEqualTo(dependencySubstitutions[1].first)
-    assertThat("com.facebook.hermes:hermes-android:0.43.0")
-        .isEqualTo(dependencySubstitutions[1].second)
-    assertThat(
-            "The hermes-engine artifact was deprecated in favor of hermes-android due to https://github.com/facebook/react-native/issues/35210."
-        )
-        .isEqualTo(dependencySubstitutions[1].third)
-  }
-
-  @Test
-  fun getDependencySubstitutions_withCustomGroup_substitutesCorrectly_withClassicHermes() {
-    val dependencySubstitutions =
-        getDependencySubstitutions(
-            DependencyUtils.Coordinates(
-                "0.42.0",
-                "0.42.0",
-                "0.43.0",
-                "io.github.test",
-                "io.github.test.hermes",
-            )
-        )
+  fun getDependencySubstitutions_withCustomGroup_substitutesCorrectly() {
+    val dependencySubstitutions = getDependencySubstitutions("0.42.0", "io.github.test")
 
     assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
     assertThat("io.github.test:react-android:0.42.0").isEqualTo(dependencySubstitutions[0].second)
@@ -505,44 +383,6 @@ 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 =
@@ -556,25 +396,9 @@ class DependencyUtilsTest {
           )
         }
 
-    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).first
 
     assertThat(versionString).isEqualTo("1000.0.0")
-    assertThat(hermesVersionString).isEqualTo("1000.0.0")
-    assertThat(hermesV1VersionString).isEqualTo("1000.0.0")
   }
 
   @Test
@@ -584,33 +408,15 @@ class DependencyUtilsTest {
           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
       """
                   .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).first
 
     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
@@ -625,23 +431,8 @@ class DependencyUtilsTest {
           )
         }
 
-    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).first
     assertThat(versionString).isEqualTo("")
-    assertThat(hermesVersionString).isEqualTo("")
-    assertThat(hermesV1VersionString).isEqualTo("")
   }
 
   @Test
@@ -657,24 +448,8 @@ class DependencyUtilsTest {
           )
         }
 
-    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).first
     assertThat(versionString).isEqualTo("")
-    assertThat(hermesVersionString).isEqualTo("")
-    assertThat(hermesV1VersionString).isEqualTo("")
   }
 
   @Test
@@ -684,30 +459,15 @@ class DependencyUtilsTest {
           writeText(
               """
         react.internal.publishingGroup=io.github.test
-        react.internal.hermesPublishingGroup=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).second
 
-    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
@@ -722,23 +482,9 @@ class DependencyUtilsTest {
           )
         }
 
-    val hermesVersionFile =
-        tempFolder.newFile("version.properties").apply {
-          writeText(
-              """
-        HERMES_V1_VERSION_NAME=
-        ANOTHER_PROPERTY=true
-      """
-                  .trimIndent()
-          )
-        }
+    val groupString = readVersionAndGroupStrings(propertiesFile).second
 
-    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

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

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

@@ -14,7 +14,6 @@ import com.facebook.react.tests.createProject
 import com.facebook.react.utils.ProjectUtils.getReactNativeArchitectures
 import com.facebook.react.utils.ProjectUtils.isEdgeToEdgeEnabled
 import com.facebook.react.utils.ProjectUtils.isHermesEnabled
-import com.facebook.react.utils.ProjectUtils.isHermesV1Enabled
 import com.facebook.react.utils.ProjectUtils.isNewArchEnabled
 import com.facebook.react.utils.ProjectUtils.needsCodegenFromPackageJson
 import java.io.File
@@ -116,32 +115,6 @@ class ProjectUtilsTest {
     assertThat(project.isEdgeToEdgeEnabled).isFalse()
   }
 
-  @Test
-  fun isHermesV1Enabled_returnsFalseByDefault() {
-    assertThat(createProject().isHermesV1Enabled).isFalse()
-  }
-
-  @Test
-  fun isHermesV1Enabled_withDisabledViaProperty_returnsFalse() {
-    val project = createProject()
-    project.extensions.extraProperties.set("hermesV1Enabled", "false")
-    assertThat(project.isHermesV1Enabled).isFalse()
-  }
-
-  @Test
-  fun isHermesV1Enabled_withEnabledViaProperty_returnsTrue() {
-    val project = createProject()
-    project.extensions.extraProperties.set("hermesV1Enabled", "true")
-    assertThat(project.isHermesV1Enabled).isTrue()
-  }
-
-  @Test
-  fun isHermesV1Enabled_withInvalidViaProperty_returnsFalse() {
-    val project = createProject()
-    project.extensions.extraProperties.set("hermesV1Enabled", "¯\\_(ツ)_/¯")
-    assertThat(project.isHermesV1Enabled).isFalse()
-  }
-
   @Test
   fun needsCodegenFromPackageJson_withCodegenConfigInPackageJson_returnsTrue() {
     val project = createProject()

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

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

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

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

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

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

packages/react-native/Libraries/BatchedBridge/BatchedBridge.js

@@ -6,7 +6,6 @@
  *
  * @flow strict
  * @format
- * @deprecated
  */
 
 'use strict';

packages/react-native/Libraries/BatchedBridge/MessageQueue.js

@@ -6,7 +6,6 @@
  *
  * @flow strict
  * @format
- * @deprecated
  */
 
 'use strict';

packages/react-native/Libraries/Components/Switch/Switch.js

@@ -264,7 +264,7 @@ const Switch: component(
       disabled,
       onTintColor: trackColorForTrue,
       style: StyleSheet.compose(
-        {alignSelf: 'flex-start' as const},
+        {height: 31, width: 51},
         StyleSheet.compose(
           style,
           ios_backgroundColor == null

packages/react-native/Libraries/Components/View/ViewNativeComponent.js

@@ -29,16 +29,6 @@ export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
   supportedCommands: ['hotspotUpdate', 'setPressed'],
 });
 
-/**
- * `ViewNativeComponent` is an internal React Native host component, and is
- * exported to provide lower-level access for libraries.
- *
- * @warning `<unstable_NativeView>` provides no semver guarantees and is not
- *   intended to be used in app code. Please use
- *   [`<View>`](https://reactnative.dev/docs/view) instead.
- */
-// Additional note: Our long term plan is to reduce the overhead of the <Text>
-// and <View> wrappers so that we no longer have any reason to export these APIs.
 export default ViewNativeComponent;
 
 export type ViewNativeComponentType = HostComponent<Props>;

packages/react-native/Libraries/Core/Timers/JSTimers.js

@@ -6,7 +6,6 @@
  *
  * @flow
  * @format
- * @deprecated
  */
 
 import NativeTiming from './NativeTiming';

packages/react-native/Libraries/Core/Timers/NativeTiming.js

@@ -6,7 +6,6 @@
  *
  * @flow strict
  * @format
- * @deprecated
  */
 
 export * from '../../../src/private/specs_DEPRECATED/modules/NativeTiming';

packages/react-native/Libraries/Core/Timers/immediateShim.js

@@ -6,7 +6,6 @@
  *
  * @flow
  * @format
- * @deprecated
  */
 
 'use strict';

packages/react-native/Libraries/Image/RCTImageBlurUtils.mm

@@ -30,8 +30,7 @@ UIImage *RCTBlurredImageWithRadius(UIImage *inputImage, CGFloat radius)
                }].CGImage;
   }
 
-  vImage_Buffer buffer1;
-  vImage_Buffer buffer2;
+  vImage_Buffer buffer1, buffer2;
   buffer1.width = buffer2.width = CGImageGetWidth(imageRef);
   buffer1.height = buffer2.height = CGImageGetHeight(imageRef);
   buffer1.rowBytes = buffer2.rowBytes = CGImageGetBytesPerRow(imageRef);

packages/react-native/Libraries/Image/RCTImageUtils.mm

@@ -212,8 +212,7 @@ BOOL RCTUpscalingRequired(
   sourceSize.height *= scale;
 
   // Calculate aspect ratios if needed (don't bother if resizeMode == stretch)
-  CGFloat aspect = 0.0;
-  CGFloat targetAspect = 0.0;
+  CGFloat aspect = 0.0, targetAspect = 0.0;
   if (resizeMode != RCTResizeModeStretch) {
     aspect = sourceSize.width / sourceSize.height;
     targetAspect = destSize.width / destSize.height;

packages/react-native/Libraries/Lists/SectionList.d.ts

@@ -35,11 +35,7 @@ export interface SectionBase<ItemT, SectionT = DefaultSectionT> {
 
   renderItem?: SectionListRenderItem<ItemT, SectionT> | undefined;
 
-  ItemSeparatorComponent?:
-    | React.ComponentType<any>
-    | React.ReactElement
-    | null
-    | undefined;
+  ItemSeparatorComponent?: React.ComponentType<any> | null | undefined;
 
   keyExtractor?: ((item: ItemT, index: number) => string) | undefined;
 }

packages/react-native/Libraries/NativeAnimation/RCTAnimationUtils.mm

@@ -90,15 +90,9 @@ uint32_t RCTInterpolateColorInRange(CGFloat value, NSArray<NSNumber *> *inputRan
   CGFloat inputMin = inputRange[rangeIndex].doubleValue;
   CGFloat inputMax = inputRange[rangeIndex + 1].doubleValue;
 
-  CGFloat redMin;
-  CGFloat greenMin;
-  CGFloat blueMin;
-  CGFloat alphaMin;
+  CGFloat redMin, greenMin, blueMin, alphaMin;
   [outputRange[rangeIndex] getRed:&redMin green:&greenMin blue:&blueMin alpha:&alphaMin];
-  CGFloat redMax;
-  CGFloat greenMax;
-  CGFloat blueMax;
-  CGFloat alphaMax;
+  CGFloat redMax, greenMax, blueMax, alphaMax;
   [outputRange[rangeIndex + 1] getRed:&redMax green:&greenMax blue:&blueMax alpha:&alphaMax];
 
   return RCTColorFromComponents(

packages/react-native/Libraries/Network/RCTInspectorNetworkReporter.mm

@@ -10,9 +10,9 @@
 #import "RCTNetworkConversions.h"
 
 #import <React/RCTLog.h>
-#import <react/networking/NetworkReporter.h>
+#import <jsinspector-modern/network/NetworkReporter.h>
 
-using namespace facebook::react;
+using namespace facebook::react::jsinspector_modern;
 
 #ifdef REACT_NATIVE_DEBUGGER_ENABLED
 namespace {

packages/react-native/Libraries/Network/React-RCTNetwork.podspec

@@ -50,7 +50,6 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-jsinspectorcdp", :framework_name => 'jsinspector_moderncdp')
   add_dependency(s, "React-jsinspectornetwork", :framework_name => 'jsinspector_modernnetwork')
   add_dependency(s, "React-NativeModulesApple", :additional_framework_paths => ["build/generated/ios"])
-  add_dependency(s, "React-networking", :framework_name => 'React_networking')
 
   add_rn_third_party_dependencies(s)
   add_rncore_dependency(s)

packages/react-native/Libraries/Renderer/shims/ReactNativeTypes.js

@@ -7,7 +7,7 @@
  * @noformat
  * @nolint
  * @flow strict
- * @generated SignedSource<<c0e57723772ea5f1aa8c3c897ac3c216>>
+ * @generated SignedSource<<deb7924d11c790f99448a1c2f0edddb9>>
  */
 
 import type {
@@ -135,7 +135,6 @@ export type RenderRootOptions = {
     error: mixed,
     errorInfo: {+componentStack?: ?string},
   ) => void,
-  onDefaultTransitionIndicator?: () => void | (() => void),
 };
 
 /**

packages/react-native/Libraries/Text/TextNativeComponent.js

@@ -65,16 +65,6 @@ const virtualTextViewConfig = {
   uiViewClassName: 'RCTVirtualText',
 };
 
-/**
- * `NativeText` is an internal React Native host component, and is exported to
- * provide lower-level access for libraries.
- *
- * @warning `<unstable_NativeText>` provides no semver guarantees and is not
- *   intended to be used in app code. Please use
- *   [`<Text>`](https://reactnative.dev/docs/text) instead.
- */
-// Additional note: Our long term plan is to reduce the overhead of the <Text>
-// and <View> wrappers so that we no longer have any reason to export these APIs.
 export const NativeText: HostComponent<NativeTextProps> =
   (createReactNativeComponentClass('RCTText', () =>
     /* $FlowFixMe[incompatible-type] Natural Inference rollout. See

packages/react-native/Libraries/TypeSafety/RCTConvertHelpers.h

@@ -67,7 +67,7 @@ template <typename T>
 facebook::react::LazyVector<T> RCTBridgingToVec(id value, T (^ctor)(id element))
 {
   NSArray *array = RCTBridgingToArray(value);
-  using _size_t = typename facebook::react::LazyVector<T>::size_type;
+  typedef typename facebook::react::LazyVector<T>::size_type _size_t;
   _size_t size = static_cast<_size_t>(array.count);
   return facebook::react::LazyVector<T>::fromUnsafeRawValue(array, size, ctor);
 }

packages/react-native/Package.swift

@@ -68,17 +68,6 @@ let reactOSCompat = RNTarget(
   path: "ReactCommon/oscompat"
 )
 
-let rctSwiftUI = RNTarget(
-  name: .rctSwiftUI,
-  path: "ReactApple/RCTSwiftUI"
-)
-
-let rctSwiftUIWrapper = RNTarget(
-  name: .rctSwiftUIWrapper,
-  path: "ReactApple/RCTSwiftUIWrapper",
-  dependencies: [.rctSwiftUI]
-)
-
 // React-rendererconsistency.podspec
 let reactRendererConsistency = RNTarget(
   name: .reactRendererConsistency,
@@ -222,18 +211,6 @@ let reactHermes = RNTarget(
   ]
 )
 
-/// React-networking.podspec
-let reactNetworking = RNTarget(
-  name: .reactNetworking,
-  path: "ReactCommon/react/networking",
-  excludedPaths: ["tests"],
-  dependencies: [.reactNativeDependencies, .reactJsInspectorNetwork, .reactPerformanceTimeline],
-  defines: [
-    CXXSetting.define("REACT_NATIVE_DEBUGGER_ENABLED", to: "1", .when(configuration: BuildConfiguration.debug)),
-    CXXSetting.define("REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY", to: "1", .when(configuration: BuildConfiguration.debug)),
-  ]
-)
-
 /// React-performancecdpmetrics.podspec
 let reactPerformanceCdpMetrics = RNTarget(
   name: .reactPerformanceCdpMetrics,
@@ -327,13 +304,6 @@ let reactIdleCallbacksNativeModule = RNTarget(
   dependencies: [.reactNativeDependencies, .reactDebug, .reactFeatureFlags, .reactUtils, .reactPerfLogger, .reactCxxReact, .reactTurboModuleCore]
 )
 
-/// React-webperformance.podspec
-let reactWebPerformanceNativeModule = RNTarget(
-  name: .reactWebPerformanceNativeModule,
-  path: "ReactCommon/react/nativemodule/webperformance",
-  dependencies: [.reactNativeDependencies, .reactCxxReact, .reactTurboModuleCore, .reactPerformanceTimeline]
-)
-
 /// React-featureflagnativemodule.podspec
 let reactFeatureflagsNativemodule = RNTarget(
   name: .reactFeatureflagsNativemodule,
@@ -450,7 +420,7 @@ let reactFabric = RNTarget(
 let reactRCTFabric = RNTarget(
   name: .reactRCTFabric,
   path: "React/Fabric",
-  dependencies: [.reactNativeDependencies, .reactCore, .reactRCTImage, .yoga, .reactRCTText, .jsi, .reactFabricComponents, .reactGraphics, .reactImageManager, .reactDebug, .reactUtils, .reactPerformanceTimeline, .reactRendererDebug, .reactRendererConsistency, .reactRuntimeScheduler, .reactRCTAnimation, .reactJsInspector, .reactJsInspectorNetwork, .reactJsInspectorTracing, .reactFabric, .reactFabricImage, .rctSwiftUIWrapper]
+  dependencies: [.reactNativeDependencies, .reactCore, .reactRCTImage, .yoga, .reactRCTText, .jsi, .reactFabricComponents, .reactGraphics, .reactImageManager, .reactDebug, .reactUtils, .reactPerformanceTimeline, .reactRendererDebug, .reactRendererConsistency, .reactRuntimeScheduler, .reactRCTAnimation, .reactJsInspector, .reactJsInspectorNetwork, .reactJsInspectorTracing, .reactFabric, .reactFabricImage]
 )
 
 /// React-FabricComponents.podspec
@@ -590,15 +560,12 @@ let targets = [
   reactCore,
   reactCoreRCTWebsocket,
   reactFabric,
-  rctSwiftUI,
-  rctSwiftUIWrapper,
   reactRCTFabric,
   reactFabricComponents,
   reactFabricImage,
   reactNativeDependencies,
   hermesPrebuilt,
   reactJsiTooling,
-  reactNetworking,
   reactPerformanceCdpMetrics,
   reactPerformanceTimeline,
   reactRuntimeScheduler,
@@ -623,7 +590,6 @@ let targets = [
   reactTurboModuleCoreDefaults,
   reactTurboModuleCoreMicrotasks,
   reactIdleCallbacksNativeModule,
-  reactWebPerformanceNativeModule,
   reactFeatureflagsNativemodule,
   reactNativeModuleDom,
   reactAppDelegate,
@@ -741,9 +707,6 @@ extension String {
   static let logger = "React-logger"
   static let mapbuffer = "React-Mapbuffer"
 
-  static let rctSwiftUI = "RCTSwiftUI"
-  static let rctSwiftUIWrapper = "RCTSwiftUIWrapper"
-
   static let rctDeprecation = "RCT-Deprecation"
   static let yoga = "Yoga"
   static let reactUtils = "React-utils"
@@ -774,7 +737,6 @@ extension String {
   static let hermesPrebuilt = "hermes-prebuilt"
 
   static let reactJsiTooling = "React-jsitooling"
-  static let reactNetworking = "React-networking"
   static let reactPerformanceCdpMetrics = "React-performancecdpmetrics"
   static let reactPerformanceTimeline = "React-performancetimeline"
   static let reactRuntimeScheduler = "React-runtimescheduler"
@@ -802,7 +764,6 @@ extension String {
   static let reactTurboModuleCoreDefaults = "ReactCommon/turbomodule/core/defaults"
   static let reactTurboModuleCoreMicrotasks = "ReactCommon/turbomodule/core/microtasks"
   static let reactIdleCallbacksNativeModule = "React-idlecallbacksnativemodule"
-  static let reactWebPerformanceNativeModule = "React-webperformancenativemodule"
   static let reactFeatureflagsNativemodule = "React-featureflagsnativemodule"
   static let reactNativeModuleDom = "React-domnativemodule"
   static let reactAppDelegate = "React-RCTAppDelegate"

packages/react-native/React/Base/RCTBridgeModule.h

@@ -69,7 +69,6 @@ RCT_EXTERN_C_END
  * will be used as the JS module name. If omitted, the JS module name will
  * match the Objective-C class name.
  */
-#ifndef RCT_FIT_RM_OLD_RUNTIME
 #define RCT_EXPORT_MODULE(js_name)          \
   RCT_EXTERN void RCTRegisterModule(Class); \
   +(NSString *)moduleName                   \
@@ -81,17 +80,6 @@ RCT_EXTERN_C_END
     RCTRegisterModule(self);                \
   }
 
-#else
-
-#define RCT_EXPORT_MODULE(js_name)          \
-  RCT_EXTERN void RCTRegisterModule(Class); \
-  +(NSString *)moduleName                   \
-  {                                         \
-    return @ #js_name;                      \
-  }
-
-#endif // RCT_FIT_RM_OLD_RUNTIME
-
 /**
  * Same as RCT_EXPORT_MODULE, but uses __attribute__((constructor)) for module
  * registration. Useful for registering swift classes that forbids use of load

packages/react-native/React/Base/RCTUtils.mm

@@ -721,13 +721,13 @@ NSData *__nullable RCTGzipData(NSData *__nullable input, float level)
 
   void *libz = dlopen("/usr/lib/libz.dylib", RTLD_LAZY);
 
-  using DeflateInit2_ = int (*)(z_streamp, int, int, int, int, int, const char *, int);
+  typedef int (*DeflateInit2_)(z_streamp, int, int, int, int, int, const char *, int);
   DeflateInit2_ deflateInit2_ = (DeflateInit2_)dlsym(libz, "deflateInit2_");
 
-  using Deflate = int (*)(z_streamp, int);
+  typedef int (*Deflate)(z_streamp, int);
   Deflate deflate = (Deflate)dlsym(libz, "deflate");
 
-  using DeflateEnd = int (*)(z_streamp);
+  typedef int (*DeflateEnd)(z_streamp);
   DeflateEnd deflateEnd = (DeflateEnd)dlsym(libz, "deflateEnd");
 
   z_stream stream;

packages/react-native/React/CoreModules/RCTDeviceInfo.mm

@@ -238,10 +238,11 @@ static NSDictionary *RCTExportedDimensions(CGFloat fontScale)
 - (void)interfaceOrientationDidChange
 {
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
-  UIWindow *window = RCTKeyWindow();
-  UIInterfaceOrientation nextOrientation = window.windowScene.interfaceOrientation;
+  UIApplication *application = RCTSharedApplication();
+  UIInterfaceOrientation nextOrientation = RCTKeyWindow().windowScene.interfaceOrientation;
 
-  BOOL isRunningInFullScreen = window ? CGRectEqualToRect(window.frame, window.screen.bounds) : YES;
+  BOOL isRunningInFullScreen =
+      CGRectEqualToRect(application.delegate.window.frame, application.delegate.window.screen.bounds);
   // We are catching here two situations for multitasking view:
   // a) The app is in Split View and the container gets resized -> !isRunningInFullScreen
   // b) The app changes to/from fullscreen example: App runs in slide over mode and goes into fullscreen->

packages/react-native/React/DevSupport/RCTPackagerConnection.h

@@ -59,7 +59,7 @@ typedef void (^RCTConnectedHandler)(void);
 /** Disconnects and removes all handlers. */
 - (void)stop;
 
-/** Reconnect with given packager server, if packagerServerHostPort has changed. */
+/** Reconnect with given packager server. */
 - (void)reconnect:(NSString *)packagerServerHostPort;
 
 /**

packages/react-native/React/DevSupport/RCTPackagerConnection.mm

@@ -160,7 +160,6 @@ static RCTReconnectingWebSocket *socketForLocation(NSString *const serverHostPor
 
 - (void)bundleURLSettingsChanged
 {
-  // Will only reconnect if `packagerServerHostPort` has actually changed
   [self reconnect:[[RCTBundleURLProvider sharedSettings] packagerServerHostPort]];
 }
 

packages/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTEnhancedScrollView.mm

@@ -81,8 +81,7 @@
     return;
   }
 
-  CGFloat top = 0;
-  CGFloat left = 0;
+  CGFloat top = 0, left = 0;
   if (contentSize.width < boundsSize.width) {
     left = (boundsSize.width - contentSize.width) * 0.5f;
   }

packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -12,7 +12,6 @@
 #import <objc/runtime.h>
 #import <ranges>
 
-#import <RCTSwiftUIWrapper/RCTSwiftUIContainerViewWrapper.h>
 #import <React/RCTAssert.h>
 #import <React/RCTBorderDrawing.h>
 #import <React/RCTBoxShadow.h>
@@ -51,7 +50,6 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
   UIView *_containerView;
   BOOL _useCustomContainerView;
   NSMutableSet<NSString *> *_accessibilityOrderNativeIDs;
-  RCTSwiftUIContainerViewWrapper *_swiftUIWrapper;
 }
 
 #ifdef RCT_DYNAMIC_FRAMEWORKS
@@ -578,10 +576,6 @@ const CGFloat BACKGROUND_COLOR_ZPOSITION = -1024.0f;
     auto newTransform = _props->resolveTransform(layoutMetrics);
     self.layer.transform = RCTCATransform3DFromTransformMatrix(newTransform);
   }
-
-  if (_swiftUIWrapper != nullptr) {
-    [_swiftUIWrapper updateLayoutWithBounds:self.bounds];
-  }
 }
 
 - (BOOL)isJSResponder
@@ -799,95 +793,43 @@ static RCTBorderStyle RCTBorderStyleFromOutlineStyle(OutlineStyle outlineStyle)
       ((!_props->boxShadow.empty() || (clipToPaddingBox && nonZeroBorderWidth)) || _props->outlineWidth != 0);
 }
 
-// The view that is used as the receiver for all styling (borders, background,
-// etc.). Most of the time, this is just `self`. When a view has a filter like
-// `blur` applied, we need to wrap it in a SwiftUI view to render the effect.
-// In this case, `effectiveContentView` will be the content view inside the
-// SwiftUI wrapper.
-- (UIView *)effectiveContentView
-{
-  if (!ReactNativeFeatureFlags::enableSwiftUIBasedFilters()) {
-    return self;
-  }
-
-  UIView *effectiveContentView = self;
-
-  if (self.styleNeedsSwiftUIContainer) {
-    if (_swiftUIWrapper == nullptr) {
-      _swiftUIWrapper = [RCTSwiftUIContainerViewWrapper new];
-      UIView *swiftUIContentView = [[UIView alloc] init];
-      for (UIView *subview = nullptr in self.subviews) {
-        [swiftUIContentView addSubview:subview];
-      }
-      swiftUIContentView.clipsToBounds = self.clipsToBounds;
-      self.clipsToBounds = NO;
-      swiftUIContentView.layer.mask = self.layer.mask;
-      self.layer.mask = nil;
-      [_swiftUIWrapper updateContentView:swiftUIContentView];
-      [_swiftUIWrapper updateLayoutWithBounds:self.bounds];
-      [self addSubview:_swiftUIWrapper.hostingView];
-
-      [self transferVisualPropertiesFromView:self toView:swiftUIContentView];
-    }
-
-    effectiveContentView = _swiftUIWrapper.contentView;
-  } else {
-    if (_swiftUIWrapper != nullptr) {
-      UIView *swiftUIContentView = _swiftUIWrapper.contentView;
-      for (UIView *subview = nullptr in swiftUIContentView.subviews) {
-        [self addSubview:subview];
-      }
-      self.clipsToBounds = swiftUIContentView.clipsToBounds;
-      self.layer.mask = swiftUIContentView.layer.mask;
-
-      [self transferVisualPropertiesFromView:swiftUIContentView toView:self];
-
-      [_swiftUIWrapper.hostingView removeFromSuperview];
-      _swiftUIWrapper = nil;
-    }
-  }
-
-  return effectiveContentView;
-}
-
 // This UIView is the UIView that holds all subviews. It is sometimes not self
 // because we want to render "overflow ink" that extends beyond the bounds of
 // the view and is not affected by clipping.
 - (UIView *)currentContainerView
 {
-  UIView *effectiveContentView = self.effectiveContentView;
-
   if (_useCustomContainerView) {
     if (!_containerView) {
       _containerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height)];
-      for (UIView *subview = nullptr in effectiveContentView.subviews) {
+      for (UIView *subview in self.subviews) {
         [_containerView addSubview:subview];
       }
-      _containerView.clipsToBounds = effectiveContentView.clipsToBounds;
-      effectiveContentView.clipsToBounds = NO;
-      _containerView.layer.mask = effectiveContentView.layer.mask;
-      effectiveContentView.layer.mask = nil;
-      [effectiveContentView addSubview:_containerView];
+      _containerView.clipsToBounds = self.clipsToBounds;
+      self.clipsToBounds = NO;
+      _containerView.layer.mask = self.layer.mask;
+      self.layer.mask = nil;
+      [self addSubview:_containerView];
     }
 
-    effectiveContentView = _containerView;
+    return _containerView;
   } else {
     if (_containerView) {
       for (UIView *subview in _containerView.subviews) {
-        [effectiveContentView addSubview:subview];
+        [self addSubview:subview];
       }
-      effectiveContentView.clipsToBounds = _containerView.clipsToBounds;
-      effectiveContentView.layer.mask = _containerView.layer.mask;
+      self.clipsToBounds = _containerView.clipsToBounds;
+      self.layer.mask = _containerView.layer.mask;
       [_containerView removeFromSuperview];
       _containerView = nil;
     }
+
+    return self;
   }
-  return effectiveContentView;
 }
 
 - (void)invalidateLayer
 {
-  CALayer *layer = self.effectiveContentView.layer;
+  CALayer *layer = self.layer;
 
   if (CGSizeEqualToSize(layer.bounds.size, CGSizeZero)) {
     return;
@@ -968,7 +910,7 @@ static RCTBorderStyle RCTBorderStyleFromOutlineStyle(OutlineStyle outlineStyle)
     if (!_backgroundColorLayer) {
       _backgroundColorLayer = [CALayer layer];
       _backgroundColorLayer.zPosition = BACKGROUND_COLOR_ZPOSITION;
-      [layer addSublayer:_backgroundColorLayer];
+      [self.layer addSublayer:_backgroundColorLayer];
     }
     [self shapeLayerToMatchView:_backgroundColorLayer borderMetrics:borderMetrics];
     _backgroundColorLayer.backgroundColor = backgroundColor.CGColor;
@@ -1044,43 +986,31 @@ static RCTBorderStyle RCTBorderStyleFromOutlineStyle(OutlineStyle outlineStyle)
   // filter
   [_filterLayer removeFromSuperlayer];
   _filterLayer = nil;
-  if (_swiftUIWrapper != nullptr) {
-    [_swiftUIWrapper updateBlurRadius:@(0)];
-  }
   self.layer.opacity = (float)_props->opacity;
   if (!_props->filter.empty()) {
     float multiplicativeBrightness = 1;
-    bool hasBrightnessFilter = false;
     for (const auto &primitive : _props->filter) {
       if (std::holds_alternative<Float>(primitive.parameters)) {
         if (primitive.type == FilterType::Brightness) {
           multiplicativeBrightness *= std::get<Float>(primitive.parameters);
-          hasBrightnessFilter = true;
         } else if (primitive.type == FilterType::Opacity) {
           self.layer.opacity *= std::get<Float>(primitive.parameters);
-        } else if (primitive.type == FilterType::Blur) {
-          if (_swiftUIWrapper != nullptr) {
-            Float blurRadius = std::get<Float>(primitive.parameters);
-            [_swiftUIWrapper updateBlurRadius:@(blurRadius)];
-          }
         }
       }
     }
 
-    if (hasBrightnessFilter) {
-      _filterLayer = [CALayer layer];
-      [self shapeLayerToMatchView:_filterLayer borderMetrics:borderMetrics];
-      _filterLayer.compositingFilter = @"multiplyBlendMode";
-      _filterLayer.backgroundColor = [UIColor colorWithRed:multiplicativeBrightness
-                                                     green:multiplicativeBrightness
-                                                      blue:multiplicativeBrightness
-                                                     alpha:self.layer.opacity]
-                                         .CGColor;
-      // So that this layer is always above any potential sublayers this view may
-      // add
-      _filterLayer.zPosition = CGFLOAT_MAX;
-      [layer addSublayer:_filterLayer];
-    }
+    _filterLayer = [CALayer layer];
+    [self shapeLayerToMatchView:_filterLayer borderMetrics:borderMetrics];
+    _filterLayer.compositingFilter = @"multiplyBlendMode";
+    _filterLayer.backgroundColor = [UIColor colorWithRed:multiplicativeBrightness
+                                                   green:multiplicativeBrightness
+                                                    blue:multiplicativeBrightness
+                                                   alpha:self.layer.opacity]
+                                       .CGColor;
+    // So that this layer is always above any potential sublayers this view may
+    // add
+    _filterLayer.zPosition = CGFLOAT_MAX;
+    [self.layer addSublayer:_filterLayer];
   }
 
   // background image
@@ -1095,7 +1025,7 @@ static RCTBorderStyle RCTBorderStyleFromOutlineStyle(OutlineStyle outlineStyle)
         [self shapeLayerToMatchView:backgroundImageLayer borderMetrics:borderMetrics];
         backgroundImageLayer.masksToBounds = YES;
         backgroundImageLayer.zPosition = BACKGROUND_COLOR_ZPOSITION;
-        [layer addSublayer:backgroundImageLayer];
+        [self.layer addSublayer:backgroundImageLayer];
         [_backgroundImageLayers addObject:backgroundImageLayer];
       } else if (std::holds_alternative<RadialGradient>(backgroundImage)) {
         const auto &radialGradient = std::get<RadialGradient>(backgroundImage);
@@ -1104,7 +1034,7 @@ static RCTBorderStyle RCTBorderStyleFromOutlineStyle(OutlineStyle outlineStyle)
         [self shapeLayerToMatchView:backgroundImageLayer borderMetrics:borderMetrics];
         backgroundImageLayer.masksToBounds = YES;
         backgroundImageLayer.zPosition = BACKGROUND_COLOR_ZPOSITION;
-        [layer addSublayer:backgroundImageLayer];
+        [self.layer addSublayer:backgroundImageLayer];
         [_backgroundImageLayers addObject:backgroundImageLayer];
       }
     }
@@ -1126,7 +1056,7 @@ static RCTBorderStyle RCTBorderStyleFromOutlineStyle(OutlineStyle outlineStyle)
           RCTUIEdgeInsetsFromEdgeInsets(borderMetrics.borderWidths),
           self.layer.bounds.size);
       shadowLayer.zPosition = _borderLayer.zPosition;
-      [layer addSublayer:shadowLayer];
+      [self.layer addSublayer:shadowLayer];
       [_boxShadowLayers addObject:shadowLayer];
     }
   }
@@ -1480,66 +1410,6 @@ static NSString *RCTRecursiveAccessibilityLabel(UIView *view)
   return RCTNSStringFromString([[self class] componentDescriptorProvider].name);
 }
 
-- (BOOL)styleNeedsSwiftUIContainer
-{
-  if (!_props->filter.empty()) {
-    for (const auto &primitive : _props->filter) {
-      if (primitive.type == FilterType::Blur) {
-        return YES;
-      }
-    }
-  }
-  return NO;
-}
-
-- (void)transferVisualPropertiesFromView:(UIView *)sourceView toView:(UIView *)destinationView
-{
-  // shadow
-  destinationView.layer.shadowColor = sourceView.layer.shadowColor;
-  sourceView.layer.shadowColor = nil;
-  destinationView.layer.shadowOffset = sourceView.layer.shadowOffset;
-  sourceView.layer.shadowOffset = CGSizeZero;
-  destinationView.layer.shadowOpacity = sourceView.layer.shadowOpacity;
-  sourceView.layer.shadowOpacity = 0;
-  destinationView.layer.shadowRadius = sourceView.layer.shadowRadius;
-  sourceView.layer.shadowRadius = 0;
-
-  // background
-  destinationView.layer.backgroundColor = sourceView.layer.backgroundColor;
-  sourceView.layer.backgroundColor = nil;
-  if (_backgroundColorLayer != nullptr) {
-    [destinationView.layer addSublayer:_backgroundColorLayer];
-  }
-
-  // border
-  destinationView.layer.borderColor = sourceView.layer.borderColor;
-  sourceView.layer.borderColor = nil;
-  destinationView.layer.borderWidth = sourceView.layer.borderWidth;
-  sourceView.layer.borderWidth = 0;
-
-  // corner
-  destinationView.layer.cornerRadius = sourceView.layer.cornerRadius;
-  sourceView.layer.cornerRadius = 0;
-  destinationView.layer.cornerCurve = sourceView.layer.cornerCurve;
-
-  // custom layers
-  if (_borderLayer != nullptr) {
-    [destinationView.layer addSublayer:_borderLayer];
-  }
-  if (_outlineLayer != nullptr) {
-    [destinationView.layer addSublayer:_outlineLayer];
-  }
-  if (_filterLayer != nullptr) {
-    [destinationView.layer addSublayer:_filterLayer];
-  }
-  for (CALayer *layer = nullptr in _backgroundImageLayers) {
-    [destinationView.layer addSublayer:layer];
-  }
-  for (CALayer *layer = nullptr in _boxShadowLayers) {
-    [destinationView.layer addSublayer:layer];
-  }
-}
-
 @end
 
 #ifdef __cplusplus

packages/react-native/React/React-RCTFabric.podspec

@@ -63,7 +63,6 @@ Pod::Spec.new do |s|
   s.dependency "Yoga"
   s.dependency "React-RCTText"
   s.dependency "React-jsi"
-  s.dependency "RCTSwiftUIWrapper"
 
   add_dependency(s, "React-FabricImage")
   add_dependency(s, "React-Fabric", :additional_framework_paths => [
@@ -92,9 +91,9 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-RCTAnimation", :framework_name => 'RCTAnimation')
   add_dependency(s, "React-jsinspector", :framework_name => 'jsinspector_modern')
   add_dependency(s, "React-jsinspectorcdp", :framework_name => 'jsinspector_moderncdp')
+  add_dependency(s, "React-jsinspectornetwork", :framework_name => 'jsinspector_modernnetwork')
   add_dependency(s, "React-jsinspectortracing", :framework_name => 'jsinspector_moderntracing')
   add_dependency(s, "React-performancecdpmetrics", :framework_name => 'React_performancecdpmetrics')
-  add_dependency(s, "React-networking", :framework_name => 'React_networking')
   add_dependency(s, "React-renderercss")
   add_dependency(s, "React-RCTFBReactNativeSpec")
 

packages/react-native/React/Views/RCTBorderDrawing.m

@@ -80,9 +80,7 @@ static void RCTPathAddEllipticArc(
     CGFloat endAngle,
     BOOL clockwise)
 {
-  CGFloat xScale = 1;
-  CGFloat yScale = 1;
-  CGFloat radius = 0;
+  CGFloat xScale = 1, yScale = 1, radius = 0;
   if (size.width != 0) {
     xScale = 1;
     yScale = size.height / size.width;

packages/react-native/React/Views/RCTFont+Private.h

@@ -1,16 +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.
- */
-
-#import <UIKit/UIKit.h>
-
-#import <React/RCTDefines.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-RCT_EXTERN UIFont *__nullable RCTGetLegacyDefaultFont(CGFloat fontSize, UIFontWeight fontWeight);
-
-NS_ASSUME_NONNULL_END

packages/react-native/React/Views/RCTFont.h

@@ -17,10 +17,8 @@ typedef CGFloat RCTFontWeight;
  * provide a different base font, use this override. The font weight supplied to your
  * handler will be one of "ultralight", "thin", "light", "regular", "medium",
  * "semibold", "extrabold", "bold", "heavy", or "black".
- *
- * @deprecated Use RCTSetDefaultFontResolver
  */
-RCT_EXTERN void RCTSetDefaultFontHandler(RCTFontHandler handler) __attribute__((deprecated));
+RCT_EXTERN void RCTSetDefaultFontHandler(RCTFontHandler handler);
 RCT_EXTERN BOOL RCTHasFontHandlerSet(void);
 RCT_EXTERN RCTFontWeight RCTGetFontWeight(UIFont *font);
 

packages/react-native/React/Views/RCTFont.mm

@@ -6,8 +6,6 @@
  */
 
 #import "RCTFont.h"
-#import "RCTFont+Private.h"
-
 #import "RCTAssert.h"
 #import "RCTLog.h"
 
@@ -124,15 +122,6 @@ static NSString *FontWeightDescriptionFromUIFontWeight(UIFontWeight fontWeight)
   return @"regular";
 }
 
-UIFont *RCTGetLegacyDefaultFont(CGFloat size, UIFontWeight fontWeight)
-{
-  if (defaultFontHandler != nil) {
-    return defaultFontHandler(size, FontWeightDescriptionFromUIFontWeight(fontWeight));
-  } else {
-    return nil;
-  }
-}
-
 static UIFont *cachedSystemFont(CGFloat size, RCTFontWeight weight)
 {
   static NSCache<NSValue *, UIFont *> *fontCache = [NSCache new];
@@ -146,8 +135,8 @@ static UIFont *cachedSystemFont(CGFloat size, RCTFontWeight weight)
   NSValue *cacheKey = [[NSValue alloc] initWithBytes:&key objCType:@encode(CacheKey)];
   UIFont *font = [fontCache objectForKey:cacheKey];
 
-  if (font == nil) {
-    if (defaultFontHandler != nil) {
+  if (!font) {
+    if (defaultFontHandler) {
       NSString *fontWeightDescription = FontWeightDescriptionFromUIFontWeight(weight);
       font = defaultFontHandler(size, fontWeightDescription);
     } else {

packages/react-native/React/Views/ScrollView/RCTScrollView.m

@@ -679,8 +679,7 @@ RCT_SCROLL_EVENT_HANDLER(scrollViewDidScrollToTop, onScrollToTop)
     return;
   }
 
-  CGFloat top = 0;
-  CGFloat left = 0;
+  CGFloat top = 0, left = 0;
   if (contentSize.width < boundsSize.width) {
     left = (boundsSize.width - contentSize.width) * 0.5f;
   }

packages/react-native/ReactAndroid/api/ReactAndroid.api

@@ -2354,14 +2354,12 @@ public class com/facebook/react/fabric/mounting/SurfaceMountingManager {
 	public fun sendAccessibilityEvent (II)V
 	public fun setJSResponder (IIZ)V
 	public fun stopSurface ()V
-	public fun storeSynchronousMountPropsOverride (ILcom/facebook/react/bridge/ReadableMap;)V
 	public fun sweepActiveTouchForTag (I)V
 	public fun updateEventEmitter (ILcom/facebook/react/fabric/events/EventEmitterWrapper;)V
 	public fun updateLayout (IIIIIIII)V
 	public fun updateOverflowInset (IIIII)V
 	public fun updatePadding (IIIII)V
 	public fun updateProps (ILcom/facebook/react/bridge/ReadableMap;)V
-	public fun updatePropsSynchronously (ILcom/facebook/react/bridge/ReadableMap;)V
 	public fun updateState (ILcom/facebook/react/uimanager/StateWrapper;)V
 }
 
@@ -5246,7 +5244,6 @@ public class com/facebook/react/viewmanagers/VirtualViewExperimentalManagerDeleg
 
 public abstract interface class com/facebook/react/viewmanagers/VirtualViewExperimentalManagerInterface : com/facebook/react/uimanager/ViewManagerWithGeneratedInterface {
 	public abstract fun setInitialHidden (Landroid/view/View;Z)V
-	public abstract fun setRemoveClippedSubviews (Landroid/view/View;Z)V
 	public abstract fun setRenderState (Landroid/view/View;I)V
 }
 
@@ -6726,10 +6723,9 @@ public final class com/facebook/react/views/virtual/viewexperimental/ReactVirtua
 	public fun onLayoutChange (Landroid/view/View;IIIIIIII)V
 	public fun onModeChange (Lcom/facebook/react/views/virtual/VirtualViewMode;Landroid/graphics/Rect;)V
 	public synthetic fun recycleView$xplat_js_react_native_github_packages_react_native_ReactAndroid_src_main_java_com_facebook_react_views_view_viewAndroid ()V
-	public fun updateClippingRect (Ljava/util/Set;)V
 }
 
-public final class com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager : com/facebook/react/views/view/ReactClippingViewManager, com/facebook/react/viewmanagers/VirtualViewExperimentalManagerInterface {
+public final class com/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager : com/facebook/react/uimanager/ViewGroupManager, com/facebook/react/viewmanagers/VirtualViewExperimentalManagerInterface {
 	public static final field Companion Lcom/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimentalManager$Companion;
 	public static final field REACT_CLASS Ljava/lang/String;
 	public fun <init> ()V
@@ -6741,7 +6737,6 @@ public final class com/facebook/react/views/virtual/viewexperimental/ReactVirtua
 	public fun setInitialHidden (Lcom/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental;Z)V
 	public synthetic fun setNativeId (Landroid/view/View;Ljava/lang/String;)V
 	public fun setNativeId (Lcom/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental;Ljava/lang/String;)V
-	public synthetic fun setRemoveClippedSubviews (Landroid/view/View;Z)V
 	public synthetic fun setRenderState (Landroid/view/View;I)V
 	public fun setRenderState (Lcom/facebook/react/views/virtual/viewexperimental/ReactVirtualViewExperimental;I)V
 }

packages/react-native/ReactAndroid/build.gradle.kts

@@ -39,9 +39,6 @@ val downloadsDir =
 val thirdPartyNdkDir = File("$buildDir/third-party-ndk")
 val reactNativeRootDir = projectDir.parent
 
-val hermesV1Enabled =
-    rootProject.extensions.getByType(PrivateReactExtension::class.java).hermesV1Enabled.get()
-
 // We put the publishing version from gradle.properties inside ext. so other
 // subprojects can access it as well.
 extra["publishing_version"] = project.findProperty("VERSION_NAME")?.toString()!!
@@ -568,10 +565,6 @@ android {
             "-DCMAKE_POLICY_DEFAULT_CMP0069=NEW",
         )
 
-        if (hermesV1Enabled) {
-          arguments("-DHERMES_V1_ENABLED=1")
-        }
-
         targets(
             "reactnative",
             "jsi",

packages/react-native/ReactAndroid/gradle.properties

@@ -1,6 +1,5 @@
 VERSION_NAME=1000.0.0
 react.internal.publishingGroup=com.facebook.react
-react.internal.hermesPublishingGroup=com.facebook.hermes
 
 android.useAndroidX=true
 

packages/react-native/ReactAndroid/hermes-engine/build.gradle.kts

@@ -5,7 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import com.facebook.react.internal.PrivateReactExtension
 import com.facebook.react.tasks.internal.*
 import de.undercouch.gradle.tasks.download.Download
 import org.apache.tools.ant.taskdefs.condition.Os
@@ -51,8 +50,6 @@ fun getSDKManagerPath(): String {
   }
 }
 
-val hermesV1Enabled =
-    rootProject.extensions.getByType(PrivateReactExtension::class.java).hermesV1Enabled.get()
 val reactNativeRootDir = project(":packages:react-native:ReactAndroid").projectDir.parent
 val customDownloadDir = System.getenv("REACT_NATIVE_DOWNLOADS_DIR")
 val downloadsDir =
@@ -82,21 +79,12 @@ val hermesBuildOutputFileTree =
     fileTree(hermesBuildDir.toString())
         .include("**/*.cmake", "**/*.marks", "**/compiler_depends.ts", "**/Makefile", "**/link.txt")
 
-val hermesVersionProvider: Provider<String> =
-    providers.provider {
-      var hermesVersion = if (hermesV1Enabled) "250829098.0.0-stable" else "main"
-      val hermesVersionFile =
-          File(
-              reactNativeRootDir,
-              if (hermesV1Enabled) "sdks/.hermesv1version" else "sdks/.hermesversion",
-          )
+var hermesVersion = "main"
+val hermesVersionFile = File(reactNativeRootDir, "sdks/.hermesversion")
 
-      if (hermesVersionFile.exists()) {
-        hermesVersion = hermesVersionFile.readText()
-      }
-
-      hermesVersion
-    }
+if (hermesVersionFile.exists()) {
+  hermesVersion = hermesVersionFile.readText()
+}
 
 val ndkBuildJobs = Runtime.getRuntime().availableProcessors().toString()
 val prefabHeadersDir = File("$buildDir/prefab-headers")
@@ -107,11 +95,7 @@ val jsiDir = File(reactNativeRootDir, "ReactCommon/jsi")
 val downloadHermesDest = File(downloadsDir, "hermes.tar.gz")
 val downloadHermes by
     tasks.registering(Download::class) {
-      src(
-          providers.provider {
-            "https://github.com/facebook/hermes/tarball/${hermesVersionProvider.get()}"
-          }
-      )
+      src("https://github.com/facebook/hermes/tarball/${hermesVersion}")
       onlyIfModified(true)
       overwrite(true)
       quiet(true)
@@ -167,7 +151,6 @@ val configureBuildForHermes by
               "-B",
               hermesBuildDir.toString(),
               "-DJSI_DIR=" + jsiDir.absolutePath,
-              "-DCMAKE_BUILD_TYPE=Release",
           )
       if (Os.isFamily(Os.FAMILY_WINDOWS)) {
         cmakeCommandLine = cmakeCommandLine + "-GNMake Makefiles"
@@ -312,11 +295,7 @@ android {
           // Therefore we're passing as build type Release, to provide a faster build.
           // This has the (unlucky) side effect of letting AGP call the build
           // tasks `configureCMakeRelease` while is actually building the debug flavor.
-          arguments(
-              "-DCMAKE_BUILD_TYPE=Release",
-              // For debug builds, explicitly enable the Hermes Debugger.
-              "-DHERMES_ENABLE_DEBUGGER=True",
-          )
+          arguments("-DCMAKE_BUILD_TYPE=Release")
         }
       }
     }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.kt

@@ -196,9 +196,11 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :
 
   private val nodesManagerRef = AtomicReference<NativeAnimatedNodesManager?>()
 
-  @Volatile private var currentFrameNumber: Long = 0
+  private var batchingControlledByJS = false // TODO T71377544: delete
 
-  @Volatile private var currentBatchNumber: Long = 0 // frame number at last operations dispatch
+  @Volatile private var currentFrameNumber: Long = 0 // TODO T71377544: delete
+
+  @Volatile private var currentBatchNumber: Long = 0
 
   private var initializedForFabric = false
   private var initializedForNonFabric = false
@@ -280,19 +282,22 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :
 
     var batchNumber = currentBatchNumber - 1
 
-    // The problem we're trying to solve here: we could be in the middle of queueing
-    // a batch of related animation operations when Fabric flushes a batch of MountItems.
-    // It's visually bad if we execute half of the animation ops and then wait another frame
-    // (or more) to execute the rest.
-    // See mFrameNumber. If the dispatchedFrameNumber drifts too far - that
-    // is, if no MountItems are scheduled for a while, which can happen if a tree
-    // is committed but there are no changes - bring these counts back in sync and
-    // execute any queued operations. This number is arbitrary, but we want it low
-    // enough that the user shouldn't be able to see this delay in most cases.
-    currentFrameNumber++
-    if ((currentFrameNumber - currentBatchNumber) > 2) {
-      currentBatchNumber = currentFrameNumber
-      batchNumber = currentBatchNumber
+    // TODO T71377544: delete this when the JS method is confirmed safe
+    if (!batchingControlledByJS) {
+      // The problem we're trying to solve here: we could be in the middle of queueing
+      // a batch of related animation operations when Fabric flushes a batch of MountItems.
+      // It's visually bad if we execute half of the animation ops and then wait another frame
+      // (or more) to execute the rest.
+      // See mFrameNumber. If the dispatchedFrameNumber drifts too far - that
+      // is, if no MountItems are scheduled for a while, which can happen if a tree
+      // is committed but there are no changes - bring these counts back in sync and
+      // execute any queued operations. This number is arbitrary, but we want it low
+      // enough that the user shouldn't be able to see this delay in most cases.
+      currentFrameNumber++
+      if ((currentFrameNumber - currentBatchNumber) > 2) {
+        currentBatchNumber = currentFrameNumber
+        batchNumber = currentBatchNumber
+      }
     }
 
     preOperations.executeBatch(batchNumber, nodesManager)
@@ -479,14 +484,14 @@ public class NativeAnimatedModule(reactContext: ReactApplicationContext) :
     }
   }
 
-  @Suppress("DEPRECATION")
   override fun startOperationBatch() {
-    // no-op
+    batchingControlledByJS = true
+    currentBatchNumber++
   }
 
-  @Suppress("DEPRECATION")
   override fun finishOperationBatch() {
-    // no-op
+    batchingControlledByJS = false
+    currentBatchNumber++
   }
 
   override fun createAnimatedNode(tagDouble: Double, config: ReadableMap) {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedNodesManager.kt

@@ -774,8 +774,12 @@ public class NativeAnimatedNodesManager(
               ("Looks like animated nodes graph has ${reason}, there are $activeNodesCount but toposort visited only $updatedNodesCount")
           )
       if (eventListenerInitializedForFabric && cyclesDetected == 0) {
+        // TODO T71377544: investigate these SoftExceptions and see if we can remove entirely
+        // or fix the root cause
         ReactSoftExceptionLogger.logSoftException(TAG, ReactNoCrashSoftException(ex))
       } else if (eventListenerInitializedForFabric) {
+        // TODO T71377544: investigate these SoftExceptions and see if we can remove entirely
+        // or fix the root cause
         ReactSoftExceptionLogger.logSoftException(TAG, ReactNoCrashSoftException(ex))
       } else {
         throw ex

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java

@@ -96,7 +96,7 @@ public class CatalystInstanceImpl implements CatalystInstance {
   private final TraceListener mTraceListener;
   private final JavaScriptModuleRegistry mJSModuleRegistry;
   private final JSBundleLoader mJSBundleLoader;
-  private final ArrayList<PendingJSCall> mJSCallsPendingInit = new ArrayList<>();
+  private final ArrayList<PendingJSCall> mJSCallsPendingInit = new ArrayList<PendingJSCall>();
   private final Object mJSCallsPendingInitLock = new Object();
 
   private final NativeModuleRegistry mNativeModuleRegistry;

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.kt

@@ -25,7 +25,7 @@ public abstract class ReactContextBaseJavaModule : BaseJavaModule {
    * this method whenever you actually need the Activity and make sure to check for `null`.
    */
   @Deprecated(
-      "Deprecated in 0.80.0. Use getReactApplicationContext().getCurrentActivity() instead.",
+      "Deprecated in 0.80.0. Use getReactApplicationContext.getCurrentActivity() instead.",
       ReplaceWith("reactApplicationContext.currentActivity"),
   )
   protected fun getCurrentActivity(): Activity? {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/BridgelessDevSupportManager.kt

@@ -83,6 +83,6 @@ internal class BridgelessDevSupportManager(
   }
 
   fun tracingState(): TracingState {
-    return TracingState.ENABLEDINCDPMODE
+    return TracingState.DISABLED
   }
 }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/DevSupportManagerBase.kt

@@ -68,7 +68,6 @@ import com.facebook.react.devsupport.interfaces.StackFrame
 import com.facebook.react.devsupport.interfaces.TracingState
 import com.facebook.react.devsupport.interfaces.TracingStateProvider
 import com.facebook.react.devsupport.perfmonitor.PerfMonitorDevHelper
-import com.facebook.react.devsupport.perfmonitor.PerfMonitorOverlayManager
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.internal.featureflags.ReactNativeNewArchitectureFeatureFlags
 import com.facebook.react.modules.core.RCTNativeAppEventEmitter
@@ -78,7 +77,6 @@ import java.io.File
 import java.net.MalformedURLException
 import java.net.URL
 import java.util.Locale
-import javax.inject.Provider
 
 public abstract class DevSupportManagerBase(
     protected val applicationContext: Context,
@@ -184,7 +182,7 @@ public abstract class DevSupportManagerBase(
           null
         }
 
-  private var perfMonitorOverlayManager: PerfMonitorOverlayManager? = null
+  private var perfMonitorOverlayManager: PerfMonitorOverlayViewManager? = null
   private var tracingStateProvider: TracingStateProvider? = null
 
   init {
@@ -217,19 +215,19 @@ public abstract class DevSupportManagerBase(
     if (
         ReactNativeNewArchitectureFeatureFlags.enableBridgelessArchitecture() &&
             ReactNativeFeatureFlags.perfMonitorV2Enabled() &&
-            reactInstanceDevHelper is PerfMonitorDevHelper
+            reactInstanceDevHelper is PerfMonitorDevHelper &&
+            perfMonitorOverlayManager == null
     ) {
       perfMonitorOverlayManager =
-          PerfMonitorOverlayManager(
-              reactInstanceDevHelper,
-              Provider {
+          PerfMonitorOverlayViewManager(
+              Supplier {
                 val context = reactInstanceDevHelper.currentActivity
                 if (context == null || context.isFinishing) {
-                  return@Provider null
+                  return@Supplier null
                 }
                 context
               },
-              { openDebugger(DebuggerFrontendPanelName.PERFORMANCE.toString()) },
+              reactInstanceDevHelper.inspectorTarget,
           )
     }
   }
@@ -387,14 +385,10 @@ public abstract class DevSupportManagerBase(
             TracingState.ENABLEDINBACKGROUNDMODE ->
                 DevOptionHandler {
                   UiThreadUtil.runOnUiThread {
-                    if (reactInstanceDevHelper is PerfMonitorDevHelper) {
-                      reactInstanceDevHelper.inspectorTarget?.let {
-                        if (it.pauseAndAnalyzeBackgroundTrace()) {
-                          openDebugger(DebuggerFrontendPanelName.PERFORMANCE.toString())
-                        }
-                      }
-                    }
+                    if (reactInstanceDevHelper is PerfMonitorDevHelper)
+                        reactInstanceDevHelper.inspectorTarget?.pauseAndAnalyzeBackgroundTrace()
                   }
+                  openDebugger(DebuggerFrontendPanelName.PERFORMANCE.toString())
                 }
             TracingState.DISABLED ->
                 DevOptionHandler {
@@ -554,11 +548,10 @@ public abstract class DevSupportManagerBase(
   override fun onNewReactContextCreated(reactContext: ReactContext) {
     resetCurrentContext(reactContext)
 
-    if (reactInstanceDevHelper is PerfMonitorDevHelper) {
+    if (perfMonitorOverlayManager != null && reactInstanceDevHelper is PerfMonitorDevHelper) {
       perfMonitorOverlayManager?.let { manager ->
         reactInstanceDevHelper.inspectorTarget?.addPerfMonitorListener(manager)
       }
-      perfMonitorOverlayManager?.enable()
     }
   }
 
@@ -889,7 +882,6 @@ public abstract class DevSupportManagerBase(
 
             override fun onPackagerDisconnected() {
               isPackagerConnected = false
-              perfMonitorOverlayManager?.disable()
             }
 
             override fun onPackagerReloadCommand() {

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/PerfMonitorOverlayViewManager.kt

@@ -0,0 +1,278 @@
+/*
+ * 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.
+ */
+
+package com.facebook.react.devsupport
+
+import android.app.Dialog
+import android.content.Context
+import android.graphics.Color
+import android.graphics.Typeface
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.GradientDrawable
+import android.os.Handler
+import android.os.Looper
+import android.view.Gravity
+import android.view.Window
+import android.view.WindowManager
+import android.widget.LinearLayout
+import android.widget.TextView
+import androidx.core.util.Supplier
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import com.facebook.react.R
+import com.facebook.react.bridge.UiThreadUtil
+import com.facebook.react.devsupport.interfaces.PerfMonitorOverlayManager
+import com.facebook.react.devsupport.interfaces.TracingState
+import com.facebook.react.devsupport.perfmonitor.PerfMonitorInspectorTargetBinding
+import com.facebook.react.devsupport.perfmonitor.PerfMonitorUpdateListener
+import com.facebook.react.uimanager.DisplayMetricsHolder
+import com.facebook.react.uimanager.PixelUtil
+import java.util.Locale
+
+internal class PerfMonitorOverlayViewManager(
+    private val contextSupplier: Supplier<Context?>,
+    private val inspectorTarget: PerfMonitorInspectorTargetBinding?,
+) : PerfMonitorOverlayManager, PerfMonitorUpdateListener {
+  private var initialized: Boolean = false
+  private var enabled: Boolean = false
+  private var hasInteractionData: Boolean = false
+  private var interactionDialog: Dialog? = null
+  private var buttonDialog: Dialog? = null
+  private var durationLabel: TextView? = null
+  private var ttl: Int = 0
+  private var hideAfterTimeoutHandler: Handler? = null
+
+  override fun enable() {
+    UiThreadUtil.runOnUiThread {
+      enabled = true
+      if (hasInteractionData) {
+        showOverlay()
+      }
+    }
+  }
+
+  override fun disable() {
+    UiThreadUtil.runOnUiThread {
+      enabled = false
+      hideOverlay()
+    }
+  }
+
+  override fun reset() {
+    UiThreadUtil.runOnUiThread {
+      hasInteractionData = false
+      hideOverlay()
+    }
+  }
+
+  override fun onRecordingStateChanged(state: TracingState) {
+    // recordingState = state
+    // view?.updateRecordingState(state)
+  }
+
+  override fun onNewFocusedEvent(data: PerfMonitorUpdateListener.LongTaskEventData) {
+    UiThreadUtil.runOnUiThread {
+      ensureInitialized()
+      durationLabel?.text = String.format(Locale.US, "%d ms", data.durationMs)
+      durationLabel?.setTextColor(getDurationHighlightColor(data.responsivenessScore))
+      hasInteractionData = true
+      ttl = data.ttl
+
+      hideAfterTimeoutHandler?.removeCallbacksAndMessages(null)
+
+      if (enabled) {
+        showOverlay()
+
+        // Schedule hiding overlay after ttl milliseconds
+        if (ttl > 0) {
+          if (hideAfterTimeoutHandler == null) {
+            hideAfterTimeoutHandler = Handler(Looper.getMainLooper())
+          }
+          hideAfterTimeoutHandler?.postDelayed({ hideOverlay() }, ttl.toLong())
+        }
+      }
+    }
+  }
+
+  private fun ensureInitialized() {
+    if (initialized) {
+      return
+    }
+    val context = contextSupplier.get() ?: return
+    DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(context)
+    createDialog(context)
+    createButton(context)
+    initialized = true
+  }
+
+  private fun showOverlay() {
+    interactionDialog?.show()
+    buttonDialog?.show()
+  }
+
+  private fun hideOverlay() {
+    interactionDialog?.hide()
+    buttonDialog?.hide()
+  }
+
+  private fun createDialog(context: Context) {
+    val containerLayout = createInnerLayout(context)
+    val longTaskLabel =
+        TextView(context).apply {
+          textSize = TEXT_SIZE_PRIMARY
+          text = "Long Task"
+          setTextColor(Color.WHITE)
+          typeface = TYPEFACE_BOLD
+        }
+    durationLabel =
+        TextView(context).apply {
+          textSize = TEXT_SIZE_PRIMARY
+          setTextColor(COLOR_TEXT_GREEN)
+          typeface = TYPEFACE_BOLD
+        }
+    containerLayout.addView(longTaskLabel)
+    containerLayout.addView(durationLabel)
+
+    val dialog =
+        createAnchoredDialog(context, dpToPx(140f), dpToPx(16f)).apply {
+          setContentView(containerLayout)
+        }
+    dialog.window?.apply {
+      attributes =
+          attributes?.apply {
+            flags =
+                flags or
+                    WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or
+                    WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+          }
+    }
+
+    this.interactionDialog = dialog
+  }
+
+  fun updateRecordingState(state: TracingState) {}
+
+  private fun createButton(context: Context) {
+    val buttonInner = createInnerLayout(context)
+    buttonInner.addView(
+        TextView(context).apply {
+          text = "Analyze"
+          textSize = TEXT_SIZE_PRIMARY
+          setTextColor(Color.WHITE)
+          typeface = TYPEFACE_BOLD
+        }
+    )
+    buttonInner.addView(
+        TextView(context).apply {
+          text = "cmd + A"
+          textSize = TEXT_SIZE_ACCESSORY
+          setTextColor(Color.WHITE)
+          alpha = 0.7f
+          typeface = TYPEFACE_BOLD
+        }
+    )
+    val buttonView =
+        LinearLayout(context).apply {
+          orientation = LinearLayout.VERTICAL
+          setPadding(
+              dpToPx(8f).toInt(),
+              dpToPx(16f).toInt(),
+              dpToPx(16f).toInt(),
+              dpToPx(8f).toInt(),
+          )
+          addView(buttonInner)
+          setOnClickListener { inspectorTarget?.pauseAndAnalyzeBackgroundTrace() }
+        }
+    val dialog =
+        createAnchoredDialog(context, dpToPx(0f), dpToPx(0f)).apply { setContentView(buttonView) }
+    dialog.window?.apply {
+      attributes =
+          attributes?.apply { flags = flags or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE }
+    }
+
+    this.buttonDialog = dialog
+  }
+
+  private fun createAnchoredDialog(context: Context, offsetX: Float, offsetY: Float): Dialog {
+    val dialog =
+        Dialog(context, R.style.NoAnimationDialog).apply {
+          requestWindowFeature(Window.FEATURE_NO_TITLE)
+          window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+          window?.setDimAmount(0f)
+          setCancelable(false)
+        }
+    dialog.window?.apply {
+      attributes =
+          attributes?.apply {
+            width = WindowManager.LayoutParams.WRAP_CONTENT
+            height = WindowManager.LayoutParams.WRAP_CONTENT
+            gravity = Gravity.TOP or Gravity.END
+            x = offsetX.toInt()
+            y = offsetY.toInt()
+          }
+    }
+    dialog.window?.decorView?.let { decorView ->
+      ViewCompat.setOnApplyWindowInsetsListener(decorView) { view, windowInsets ->
+        val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+        val layoutParams = (view.layoutParams as WindowManager.LayoutParams)
+        layoutParams.y = insets.top + offsetY.toInt()
+        dialog.window?.attributes = layoutParams
+        WindowInsetsCompat.CONSUMED
+      }
+    }
+
+    return dialog
+  }
+
+  private fun createInnerLayout(context: Context): LinearLayout {
+    return LinearLayout(context).apply {
+      orientation = LinearLayout.HORIZONTAL
+      gravity = Gravity.CENTER_VERTICAL
+      val paddingHorizontal = dpToPx(14f).toInt()
+      val paddingVertical = dpToPx(8f).toInt()
+      setPadding(paddingHorizontal, paddingVertical, paddingHorizontal, paddingVertical)
+      layoutParams =
+          LinearLayout.LayoutParams(
+              LinearLayout.LayoutParams.WRAP_CONTENT,
+              LinearLayout.LayoutParams.WRAP_CONTENT,
+          )
+      background =
+          GradientDrawable().apply {
+            shape = GradientDrawable.RECTANGLE
+            setColor(Color.BLACK)
+            cornerRadius = dpToPx(14.5f)
+            alpha = (0.8 * 255).toInt()
+            setStroke(dpToPx(1f).toInt(), COLOR_OVERLAY_BORDER)
+          }
+      showDividers = LinearLayout.SHOW_DIVIDER_MIDDLE
+      dividerDrawable =
+          object : ColorDrawable(Color.TRANSPARENT) {
+            override fun getIntrinsicWidth(): Int = dpToPx(8f).toInt()
+          }
+    }
+  }
+
+  private fun getDurationHighlightColor(responsivenessScore: Int): Int {
+    return when (responsivenessScore) {
+      3 -> COLOR_TEXT_RED
+      2 -> COLOR_TEXT_YELLOW
+      else -> COLOR_TEXT_GREEN
+    }
+  }
+
+  private fun dpToPx(dp: Float): Float = PixelUtil.toPixelFromDIP(dp)
+
+  companion object {
+    private val COLOR_TEXT_GREEN = Color.parseColor("#4AEB2F")
+    private val COLOR_TEXT_YELLOW = Color.parseColor("#FFAA00")
+    private val COLOR_TEXT_RED = Color.parseColor("#FF0000")
+    private val COLOR_OVERLAY_BORDER = Color.parseColor("#6C6C6C")
+    private val TEXT_SIZE_PRIMARY = 13f
+    private val TEXT_SIZE_ACCESSORY = 9f
+    private val TYPEFACE_BOLD = Typeface.create("sans-serif", Typeface.BOLD)
+  }
+}

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/interfaces/PerfMonitorOverlayManager.kt

@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+package com.facebook.react.devsupport.interfaces
+
+/** [Experimental] Interface to manage the V2 Perf Monitor overlay. */
+internal interface PerfMonitorOverlayManager {
+  /** Enable the Perf Monitor overlay. Will be shown when updates are received. */
+  public fun enable()
+
+  /** Disable the Perf Monitor overlay. Will remain hidden when updates are received. */
+  public fun disable()
+
+  /** Reset the Perf Monitor overlay, e.g. after a reload. */
+  public fun reset()
+}

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorInspectorTargetBinding.kt

@@ -7,21 +7,13 @@
 
 package com.facebook.react.devsupport.perfmonitor
 
-import com.facebook.react.devsupport.interfaces.TracingState
-
 /**
  * [Experimental] Interface implemented by [com.facebook.react.runtime.ReactHostInspectorTarget]
  * exposing actions for the V2 Perf Monitor.
  */
 internal interface PerfMonitorInspectorTargetBinding {
-  /** Get the current CDP or background performance tracing state. */
-  public fun getTracingState(): TracingState
-
-  /**
-   * Attempt to pause the current background performance trace, and open in DevTools. Returns true
-   * if there is an active session that can display the trace, false otherwise.
-   */
-  public fun pauseAndAnalyzeBackgroundTrace(): Boolean
+  /** Attempt to pause the current background performance trace, and open in DevTools. */
+  public fun pauseAndAnalyzeBackgroundTrace()
 
   /** Attempt to start a new background performance trace. */
   public fun resumeBackgroundTrace()

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorOverlayManager.kt

@@ -1,83 +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.
- */
-
-package com.facebook.react.devsupport.perfmonitor
-
-import android.content.Context
-import com.facebook.react.bridge.UiThreadUtil
-import com.facebook.react.devsupport.interfaces.TracingState
-import javax.inject.Provider
-
-internal class PerfMonitorOverlayManager(
-    private val devHelper: PerfMonitorDevHelper,
-    private val contextProvider: Provider<Context?>,
-    private val onRequestOpenDevTools: () -> Unit,
-) : PerfMonitorUpdateListener {
-  private var enabled: Boolean = false
-  private var initialized: Boolean = false
-  private var view: PerfMonitorOverlayView? = null
-  private var tracingState: TracingState = TracingState.ENABLEDINCDPMODE
-
-  private fun init() {
-    if (initialized || !enabled) {
-      return
-    }
-
-    UiThreadUtil.runOnUiThread {
-      val context = contextProvider.get() ?: return@runOnUiThread
-      view = PerfMonitorOverlayView(context, ::handleRecordingButtonPress)
-
-      // Start background tracing
-      devHelper.inspectorTarget?.resumeBackgroundTrace()
-
-      view?.show()
-      initialized = true
-    }
-  }
-
-  /** Enable the Perf Monitor overlay. Will be shown when updates are received. */
-  fun enable() {
-    enabled = true
-    init()
-  }
-
-  /** Disable the Perf Monitor overlay. Will remain hidden when updates are received. */
-  fun disable() {
-    UiThreadUtil.runOnUiThread { view?.hide() }
-    view = null
-    enabled = false
-  }
-
-  /** Reset the Perf Monitor overlay, e.g. after a reload. */
-  fun reset() {
-    // Update with current recording state
-    onRecordingStateChanged(
-        devHelper.inspectorTarget?.getTracingState() ?: TracingState.ENABLEDINCDPMODE
-    )
-  }
-
-  override fun onRecordingStateChanged(state: TracingState) {
-    tracingState = state
-    view?.updateRecordingState(state)
-  }
-
-  private fun handleRecordingButtonPress() {
-    when (tracingState) {
-      TracingState.ENABLEDINBACKGROUNDMODE -> {
-        devHelper.inspectorTarget?.let {
-          if (!it.pauseAndAnalyzeBackgroundTrace()) {
-            onRequestOpenDevTools()
-          }
-        }
-      }
-      TracingState.DISABLED -> {
-        devHelper.inspectorTarget?.resumeBackgroundTrace()
-      }
-      TracingState.ENABLEDINCDPMODE -> Unit
-    }
-  }
-}

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorOverlayView.kt

@@ -1,186 +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.
- */
-
-package com.facebook.react.devsupport.perfmonitor
-
-import android.app.Dialog
-import android.content.Context
-import android.graphics.Color
-import android.graphics.Typeface
-import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.GradientDrawable
-import android.view.Gravity
-import android.view.Window
-import android.view.WindowManager
-import android.widget.LinearLayout
-import android.widget.TextView
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import com.facebook.react.R
-import com.facebook.react.devsupport.interfaces.TracingState
-import com.facebook.react.uimanager.DisplayMetricsHolder
-import com.facebook.react.uimanager.PixelUtil
-
-internal class PerfMonitorOverlayView(
-    private val context: Context,
-    private val onButtonPress: () -> Unit,
-) {
-  private val dialog: Dialog
-  private lateinit var statusLabel: TextView
-  private lateinit var tooltipLabel: TextView
-  private lateinit var statusIndicator: TextView
-
-  init {
-    DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(context)
-    dialog = createToolbarDialog()
-  }
-
-  fun show() {
-    dialog.show()
-  }
-
-  fun hide() {
-    dialog.hide()
-  }
-
-  fun updateRecordingState(state: TracingState) {
-    if (state == TracingState.ENABLEDINCDPMODE) {
-      dialog.hide()
-      return
-    }
-
-    if (state == TracingState.ENABLEDINBACKGROUNDMODE) {
-      (statusIndicator.background as GradientDrawable).setColor(Color.RED)
-      statusLabel.text = "Background Profiling Active"
-      tooltipLabel.text = "Press ☰ to open"
-    } else {
-      (statusIndicator.background as GradientDrawable).setColor(Color.GRAY)
-      statusLabel.text = "Background Profiling Stopped"
-      tooltipLabel.text = "Press ☰ to restart"
-    }
-    dialog.show()
-  }
-
-  private fun createToolbarDialog(): Dialog {
-    statusIndicator =
-        TextView(context).apply {
-          width = dpToPx(12f).toInt()
-          height = dpToPx(12f).toInt()
-          background =
-              GradientDrawable().apply {
-                shape = GradientDrawable.OVAL
-                setColor(Color.RED)
-              }
-        }
-
-    val textContainer =
-        LinearLayout(context).apply {
-          orientation = LinearLayout.VERTICAL
-          layoutParams =
-              LinearLayout.LayoutParams(
-                  LinearLayout.LayoutParams.WRAP_CONTENT,
-                  LinearLayout.LayoutParams.WRAP_CONTENT,
-              )
-        }
-    statusLabel =
-        TextView(context).apply {
-          textSize = TEXT_SIZE_PRIMARY
-          setTextColor(Color.WHITE)
-          typeface = TYPEFACE_BOLD
-        }
-    tooltipLabel =
-        TextView(context).apply {
-          textSize = TEXT_SIZE_ACCESSORY
-          setTextColor(Color.WHITE)
-          typeface = TYPEFACE_BOLD
-        }
-    textContainer.addView(statusLabel)
-    textContainer.addView(tooltipLabel)
-
-    val containerLayout = createInnerLayout()
-    containerLayout.setOnClickListener { onButtonPress() }
-    containerLayout.addView(statusIndicator)
-    containerLayout.addView(textContainer)
-
-    val dialog =
-        createAnchoredDialog(dpToPx(12f), dpToPx(12f)).apply { setContentView(containerLayout) }
-    dialog.window?.apply {
-      attributes =
-          attributes?.apply { flags = flags or WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE }
-    }
-
-    return dialog
-  }
-
-  private fun createAnchoredDialog(offsetX: Float, offsetY: Float): Dialog {
-    val dialog =
-        Dialog(context, R.style.NoAnimationDialog).apply {
-          requestWindowFeature(Window.FEATURE_NO_TITLE)
-          window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-          window?.setDimAmount(0f)
-          setCancelable(false)
-        }
-    dialog.window?.apply {
-      attributes =
-          attributes?.apply {
-            width = WindowManager.LayoutParams.WRAP_CONTENT
-            height = WindowManager.LayoutParams.WRAP_CONTENT
-            gravity = Gravity.TOP or Gravity.END
-            x = offsetX.toInt()
-            y = offsetY.toInt()
-          }
-    }
-    dialog.window?.decorView?.let { decorView ->
-      ViewCompat.setOnApplyWindowInsetsListener(decorView) { view, windowInsets ->
-        val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
-        val layoutParams = (view.layoutParams as WindowManager.LayoutParams)
-        layoutParams.y = insets.top + offsetY.toInt()
-        dialog.window?.attributes = layoutParams
-        WindowInsetsCompat.CONSUMED
-      }
-    }
-
-    return dialog
-  }
-
-  private fun createInnerLayout(): LinearLayout {
-    return LinearLayout(context).apply {
-      orientation = LinearLayout.HORIZONTAL
-      gravity = Gravity.CENTER_VERTICAL
-      val paddingHorizontal = dpToPx(14f).toInt()
-      val paddingVertical = dpToPx(7f).toInt()
-      setPadding(paddingHorizontal, paddingVertical, paddingHorizontal, paddingVertical)
-      layoutParams =
-          LinearLayout.LayoutParams(
-              LinearLayout.LayoutParams.WRAP_CONTENT,
-              LinearLayout.LayoutParams.WRAP_CONTENT,
-          )
-      background =
-          GradientDrawable().apply {
-            shape = GradientDrawable.RECTANGLE
-            setColor(Color.BLACK)
-            cornerRadius = dpToPx(14.5f)
-            alpha = (0.8 * 255).toInt()
-            setStroke(dpToPx(1f).toInt(), COLOR_OVERLAY_BORDER)
-          }
-      showDividers = LinearLayout.SHOW_DIVIDER_MIDDLE
-      dividerDrawable =
-          object : ColorDrawable(Color.TRANSPARENT) {
-            override fun getIntrinsicWidth(): Int = dpToPx(8f).toInt()
-          }
-    }
-  }
-
-  private fun dpToPx(dp: Float): Float = PixelUtil.toPixelFromDIP(dp)
-
-  companion object {
-    private val COLOR_OVERLAY_BORDER = Color.parseColor("#6C6C6C")
-    private val TEXT_SIZE_PRIMARY = 12f
-    private val TEXT_SIZE_ACCESSORY = 10f
-    private val TYPEFACE_BOLD = Typeface.create("sans-serif", Typeface.BOLD)
-  }
-}

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/devsupport/perfmonitor/PerfMonitorUpdateListener.kt

@@ -10,6 +10,15 @@ import com.facebook.react.devsupport.interfaces.TracingState
 
 /** [Experimental] An interface for subscribing to updates for the V2 Perf Monitor. */
 internal interface PerfMonitorUpdateListener {
+  data class LongTaskEventData(
+      val durationMs: Int,
+      val responsivenessScore: Int,
+      val ttl: Int,
+  )
+
+  /** Called when a new active performance event should be displayed. */
+  fun onNewFocusedEvent(data: LongTaskEventData)
+
   /** Called when the recording state of the background performance trace has changed. */
   fun onRecordingStateChanged(state: TracingState)
 }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

@@ -99,6 +99,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -737,17 +738,11 @@ public class FabricUIManager
    *     vertical insets.
    */
   private long getEncodedScreenSizeWithoutVerticalInsets(int surfaceId) {
-    ThemedReactContext context =
-        mMountingManager
-            .getSurfaceManagerEnforced(surfaceId, "getEncodedScreenSizeWithoutVerticalInsets")
-            .getContext();
-    if (context == null) {
-      FLog.w(TAG, "Couldn't get context from SurfaceMountingManager for surfaceId %d", surfaceId);
-      return 0;
-    } else {
-      return DisplayMetricsHolder.getEncodedScreenSizeWithoutVerticalInsets(
-          context.getCurrentActivity());
-    }
+    SurfaceMountingManager surfaceMountingManager = mMountingManager.getSurfaceManager(surfaceId);
+    Objects.requireNonNull(surfaceMountingManager);
+    ThemedReactContext context = Objects.requireNonNull(surfaceMountingManager.getContext());
+    return DisplayMetricsHolder.getEncodedScreenSizeWithoutVerticalInsets(
+        context.getCurrentActivity());
   }
 
   @Override
@@ -796,8 +791,7 @@ public class FabricUIManager
           @Override
           public void execute(MountingManager mountingManager) {
             try {
-              mountingManager.storeSynchronousMountPropsOverride(reactTag, props);
-              mountingManager.updatePropsSynchronously(reactTag, props);
+              mountingManager.updateProps(reactTag, props);
             } catch (Exception ex) {
               // TODO T42943890: Fix animations in Fabric and remove this try/catch?
               // There might always be race conditions between surface teardown and

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.kt

@@ -265,23 +265,13 @@ internal class MountingManager(
   }
 
   @UiThread
-  fun storeSynchronousMountPropsOverride(reactTag: Int, props: ReadableMap?) {
+  fun updateProps(reactTag: Int, props: ReadableMap?) {
     assertOnUiThread()
     if (props == null) {
       return
     }
 
-    getSurfaceManagerForViewEnforced(reactTag).storeSynchronousMountPropsOverride(reactTag, props)
-  }
-
-  @UiThread
-  fun updatePropsSynchronously(reactTag: Int, props: ReadableMap?) {
-    assertOnUiThread()
-    if (props == null) {
-      return
-    }
-
-    getSurfaceManagerForViewEnforced(reactTag).updatePropsSynchronously(reactTag, props)
+    getSurfaceManagerForViewEnforced(reactTag).updateProps(reactTag, props)
   }
 
   /**