fix C++ in-code docs comments to silence warnings

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

A refactor to align our C++ code style within `jsinpector-modern`.

We prefer `std::string` and `const std::string&` everywhere (see [C++ Core Guidelines F.15](https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rf-conventional)), except for when we are handing potentially very large strings — in which case we must use `string_view` all the way down.

Changelog: [Internal]

Reviewed By: hoxyq

Differential Revision: D82446939

fbshipit-source-id: 4b1c43068d1339f4b4a4c7eb06b392d0b0f624e1

.flowconfig

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

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

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

.github/workflow-scripts/createDraftRelease.js

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

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

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

.github/workflows/create-release.yml

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

.github/workflows/nightly.yml

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

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

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

.github/workflows/publish-release.yml

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

.github/workflows/retry-workflow.yml

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

.github/workflows/test-all.yml

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

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

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

CHANGELOG.md

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

build.gradle.kts

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

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

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

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

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

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

@@ -0,0 +1,41 @@
+/**
+ * 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

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

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

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

gradle.properties

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

package.json

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

packages/debugger-frontend/BUILD_INFO

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

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

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

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

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

packages/debugger-shell/package.json

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

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

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

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

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

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

@@ -152,11 +152,7 @@ function getShellBinaryAndArgs(
 ): [string, Array<string>] {
   switch (flavor) {
     case 'prebuilt':
-      return [
-        // $FlowFixMe[cannot-resolve-module] fb-dotslash includes Flow types but Flow does not pick them up
-        require('fb-dotslash'),
-        [DEVTOOLS_BINARY_DOTSLASH_FILE],
-      ];
+      return [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(
-    // $FlowFixMe[cannot-resolve-module] fb-dotslash includes Flow types but Flow does not pick them up
-    require('fb-dotslash'),
-    ['--', 'fetch', filePath],
-  );
+  const {code, stderr} = await spawnAndGetStderr(require('fb-dotslash'), [
+    '--',
+    'fetch',
+    filePath,
+  ]);
   if (code === 0) {
     return {code: 'success'};
   }

packages/dev-middleware/package.json

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

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

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

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

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

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

@@ -14,6 +14,7 @@ import com.facebook.react.utils.KotlinStdlibCompatUtils.capitalizeCompat
 import com.facebook.react.utils.NdkConfiguratorUtils.configureJsEnginePackagingOptions
 import com.facebook.react.utils.NdkConfiguratorUtils.configureNewArchPackagingOptions
 import com.facebook.react.utils.ProjectUtils.isHermesEnabled
+import com.facebook.react.utils.ProjectUtils.isHermesV1Enabled
 import com.facebook.react.utils.ProjectUtils.useThirdPartyJSC
 import com.facebook.react.utils.detectedCliFile
 import com.facebook.react.utils.detectedEntryFile
@@ -48,6 +49,7 @@ internal fun Project.configureReactTasks(variant: Variant, config: ReactExtensio
       } else {
         isHermesEnabledInProject
       }
+  val isHermesV1Enabled = project.isHermesV1Enabled || rootProject.isHermesV1Enabled
   val isDebuggableVariant =
       config.debuggableVariants.get().any { it.equals(variant.name, ignoreCase = true) }
   val useThirdPartyJSC = project.useThirdPartyJSC
@@ -78,6 +80,7 @@ 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,6 +11,7 @@ import javax.inject.Inject
 import org.gradle.api.Project
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.ListProperty
+import org.gradle.api.provider.Property
 
 /**
  * A private extension we set on the rootProject to make easier to share values at execution time
@@ -57,4 +58,6 @@ abstract class PrivateReactExtension @Inject constructor(project: Project) {
 
   val codegenDir: DirectoryProperty =
       objects.directoryProperty().convention(root.dir("node_modules/@react-native/codegen"))
+
+  val hermesV1Enabled: Property<Boolean> = objects.property(Boolean::class.java).convention(false)
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -34,9 +34,9 @@ class GenerateAutolinkingNewArchitecturesFileTaskTest {
     val inputFile = tempFolder.newFile("config.json")
 
     val task =
-        createTestTask<GenerateAutolinkingNewArchitecturesFileTask> {
-          it.generatedOutputDirectory.set(outputFolder)
-          it.autolinkInputFile.set(inputFile)
+        createTestTask<GenerateAutolinkingNewArchitecturesFileTask> { task ->
+          task.generatedOutputDirectory.set(outputFolder)
+          task.autolinkInputFile.set(inputFile)
         }
 
     assertThat(task.generatedOutputDirectory.get().asFile).isEqualTo(outputFolder)

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

@@ -33,9 +33,9 @@ class GeneratePackageListTaskTest {
     val inputFile = tempFolder.newFile("config.json")
 
     val task =
-        createTestTask<GeneratePackageListTask> {
-          it.generatedOutputDirectory.set(outputFolder)
-          it.autolinkInputFile.set(inputFile)
+        createTestTask<GeneratePackageListTask> { testTask ->
+          testTask.generatedOutputDirectory.set(outputFolder)
+          testTask.autolinkInputFile.set(inputFile)
         }
 
     assertThat(task.inputs.files.singleFile).isEqualTo(inputFile)

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

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

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

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

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

@@ -275,71 +275,160 @@ class DependencyUtilsTest {
   fun configureDependencies_withEmptyVersion_doesNothing() {
     val project = createProject()
 
-    configureDependencies(project, "")
+    configureDependencies(project, DependencyUtils.Coordinates("", "", ""))
 
     assertThat(project.configurations.first().resolutionStrategy.forcedModules.isEmpty()).isTrue()
   }
 
   @Test
-  fun configureDependencies_withVersionString_appliesResolutionStrategy() {
+  fun configureDependencies_withVersionString_appliesResolutionStrategy_withClassicHermes() {
     val project = createProject()
 
-    configureDependencies(project, "1.2.3")
+    configureDependencies(project, DependencyUtils.Coordinates("1.2.3", "4.5.6", "7.8.9"))
 
     val forcedModules = project.configurations.first().resolutionStrategy.forcedModules
     assertThat(forcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
         .isTrue()
-    assertThat(forcedModules.any { it.toString() == "com.facebook.react:hermes-android:1.2.3" })
+    assertThat(forcedModules.any { it.toString() == "com.facebook.react:hermes-android:4.5.6" })
         .isTrue()
   }
 
   @Test
-  fun configureDependencies_withVersionString_appliesOnAllProjects() {
+  fun configureDependencies_withVersionString_appliesResolutionStrategy_withHermesV1() {
+    val project = createProject()
+
+    configureDependencies(
+        project,
+        DependencyUtils.Coordinates("1.2.3", "4.5.6", "7.8.9"),
+        hermesV1Enabled = true,
+    )
+
+    val forcedModules = project.configurations.first().resolutionStrategy.forcedModules
+    assertThat(forcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
+        .isTrue()
+    assertThat(forcedModules.any { it.toString() == "com.facebook.hermes:hermes-android:7.8.9" })
+        .isTrue()
+  }
+
+  @Test
+  fun configureDependencies_withVersionString_appliesOnAllProjects_withClassicHermes() {
     val rootProject = ProjectBuilder.builder().build()
     val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
     val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
     appProject.plugins.apply("com.android.application")
     libProject.plugins.apply("com.android.library")
 
-    configureDependencies(appProject, "1.2.3")
+    configureDependencies(appProject, DependencyUtils.Coordinates("1.2.3", "4.5.6", "7.8.9"))
 
     val appForcedModules = appProject.configurations.first().resolutionStrategy.forcedModules
     val libForcedModules = libProject.configurations.first().resolutionStrategy.forcedModules
     assertThat(appForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
         .isTrue()
-    assertThat(appForcedModules.any { it.toString() == "com.facebook.react:hermes-android:1.2.3" })
+    assertThat(appForcedModules.any { it.toString() == "com.facebook.react:hermes-android:4.5.6" })
         .isTrue()
     assertThat(libForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
         .isTrue()
-    assertThat(libForcedModules.any { it.toString() == "com.facebook.react:hermes-android:1.2.3" })
+    assertThat(libForcedModules.any { it.toString() == "com.facebook.react:hermes-android:4.5.6" })
         .isTrue()
   }
 
   @Test
-  fun configureDependencies_withVersionStringAndGroupString_appliesOnAllProjects() {
+  fun configureDependencies_withVersionString_appliesOnAllProjects_withHermesV1() {
     val rootProject = ProjectBuilder.builder().build()
     val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
     val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
     appProject.plugins.apply("com.android.application")
     libProject.plugins.apply("com.android.library")
 
-    configureDependencies(appProject, "1.2.3", "io.github.test")
+    configureDependencies(
+        appProject,
+        DependencyUtils.Coordinates("1.2.3", "4.5.6", "7.8.9"),
+        hermesV1Enabled = true,
+    )
+
+    val appForcedModules = appProject.configurations.first().resolutionStrategy.forcedModules
+    val libForcedModules = libProject.configurations.first().resolutionStrategy.forcedModules
+    assertThat(appForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
+        .isTrue()
+    assertThat(appForcedModules.any { it.toString() == "com.facebook.hermes:hermes-android:7.8.9" })
+        .isTrue()
+    assertThat(libForcedModules.any { it.toString() == "com.facebook.react:react-android:1.2.3" })
+        .isTrue()
+    assertThat(libForcedModules.any { it.toString() == "com.facebook.hermes:hermes-android:7.8.9" })
+        .isTrue()
+  }
+
+  @Test
+  fun configureDependencies_withVersionStringAndGroupString_appliesOnAllProjects_withClassicHermes() {
+    val rootProject = ProjectBuilder.builder().build()
+    val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
+    val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
+    appProject.plugins.apply("com.android.application")
+    libProject.plugins.apply("com.android.library")
+
+    configureDependencies(
+        appProject,
+        DependencyUtils.Coordinates(
+            "1.2.3",
+            "4.5.6",
+            "7.8.9",
+            "io.github.test",
+            "io.github.test.hermes",
+        ),
+    )
 
     val appForcedModules = appProject.configurations.first().resolutionStrategy.forcedModules
     val libForcedModules = libProject.configurations.first().resolutionStrategy.forcedModules
     assertThat(appForcedModules.any { it.toString() == "io.github.test:react-android:1.2.3" })
         .isTrue()
-    assertThat(appForcedModules.any { it.toString() == "io.github.test:hermes-android:1.2.3" })
+    assertThat(appForcedModules.any { it.toString() == "io.github.test:hermes-android:4.5.6" })
         .isTrue()
     assertThat(libForcedModules.any { it.toString() == "io.github.test:react-android:1.2.3" })
         .isTrue()
-    assertThat(libForcedModules.any { it.toString() == "io.github.test:hermes-android:1.2.3" })
+    assertThat(libForcedModules.any { it.toString() == "io.github.test:hermes-android:4.5.6" })
         .isTrue()
   }
 
   @Test
-  fun getDependencySubstitutions_withDefaultGroup_substitutesCorrectly() {
-    val dependencySubstitutions = getDependencySubstitutions("0.42.0")
+  fun configureDependencies_withVersionStringAndGroupString_appliesOnAllProjects_withHermesV1() {
+    val rootProject = ProjectBuilder.builder().build()
+    val appProject = ProjectBuilder.builder().withName("app").withParent(rootProject).build()
+    val libProject = ProjectBuilder.builder().withName("lib").withParent(rootProject).build()
+    appProject.plugins.apply("com.android.application")
+    libProject.plugins.apply("com.android.library")
+
+    configureDependencies(
+        appProject,
+        DependencyUtils.Coordinates(
+            "1.2.3",
+            "4.5.6",
+            "7.8.9",
+            "io.github.test",
+            "io.github.test.hermes",
+        ),
+        hermesV1Enabled = true,
+    )
+
+    val appForcedModules = appProject.configurations.first().resolutionStrategy.forcedModules
+    val libForcedModules = libProject.configurations.first().resolutionStrategy.forcedModules
+    assertThat(appForcedModules.any { it.toString() == "io.github.test:react-android:1.2.3" })
+        .isTrue()
+    assertThat(
+            appForcedModules.any { it.toString() == "io.github.test.hermes:hermes-android:7.8.9" }
+        )
+        .isTrue()
+    assertThat(libForcedModules.any { it.toString() == "io.github.test:react-android:1.2.3" })
+        .isTrue()
+    assertThat(
+            libForcedModules.any { it.toString() == "io.github.test.hermes:hermes-android:7.8.9" }
+        )
+        .isTrue()
+  }
+
+  @Test
+  fun getDependencySubstitutions_withDefaultGroup_substitutesCorrectly_withClassicHermes() {
+    val dependencySubstitutions =
+        getDependencySubstitutions(DependencyUtils.Coordinates("0.42.0", "0.42.0", "0.43.0"))
 
     assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
     assertThat("com.facebook.react:react-android:0.42.0")
@@ -358,8 +447,41 @@ class DependencyUtilsTest {
   }
 
   @Test
-  fun getDependencySubstitutions_withCustomGroup_substitutesCorrectly() {
-    val dependencySubstitutions = getDependencySubstitutions("0.42.0", "io.github.test")
+  fun getDependencySubstitutions_withDefaultGroup_substitutesCorrectly_withHermesV1() {
+    val dependencySubstitutions =
+        getDependencySubstitutions(
+            DependencyUtils.Coordinates("0.42.0", "0.42.0", "0.43.0"),
+            hermesV1Enabled = true,
+        )
+
+    assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
+    assertThat("com.facebook.react:react-android:0.42.0")
+        .isEqualTo(dependencySubstitutions[0].second)
+    assertThat(
+            "The react-native artifact was deprecated in favor of react-android due to https://github.com/facebook/react-native/issues/35210."
+        )
+        .isEqualTo(dependencySubstitutions[0].third)
+    assertThat("com.facebook.react:hermes-engine").isEqualTo(dependencySubstitutions[1].first)
+    assertThat("com.facebook.hermes:hermes-android:0.43.0")
+        .isEqualTo(dependencySubstitutions[1].second)
+    assertThat(
+            "The hermes-engine artifact was deprecated in favor of hermes-android due to https://github.com/facebook/react-native/issues/35210."
+        )
+        .isEqualTo(dependencySubstitutions[1].third)
+  }
+
+  @Test
+  fun getDependencySubstitutions_withCustomGroup_substitutesCorrectly_withClassicHermes() {
+    val dependencySubstitutions =
+        getDependencySubstitutions(
+            DependencyUtils.Coordinates(
+                "0.42.0",
+                "0.42.0",
+                "0.43.0",
+                "io.github.test",
+                "io.github.test.hermes",
+            )
+        )
 
     assertThat("com.facebook.react:react-native").isEqualTo(dependencySubstitutions[0].first)
     assertThat("io.github.test:react-android:0.42.0").isEqualTo(dependencySubstitutions[0].second)
@@ -383,6 +505,44 @@ 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 =
@@ -396,9 +556,25 @@ class DependencyUtilsTest {
           )
         }
 
-    val versionString = readVersionAndGroupStrings(propertiesFile).first
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+        HERMES_V1_VERSION_NAME=1000.0.0
+        ANOTHER_PROPERTY=true
+      """
+                  .trimIndent()
+          )
+        }
+
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val versionString = strings.versionString
+    val hermesVersionString = strings.hermesVersionString
+    val hermesV1VersionString = strings.hermesV1VersionString
 
     assertThat(versionString).isEqualTo("1000.0.0")
+    assertThat(hermesVersionString).isEqualTo("1000.0.0")
+    assertThat(hermesV1VersionString).isEqualTo("1000.0.0")
   }
 
   @Test
@@ -408,15 +584,33 @@ 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 versionString = readVersionAndGroupStrings(propertiesFile).first
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+        HERMES_V1_VERSION_NAME=250829098.0.0-stable
+        ANOTHER_PROPERTY=true
+      """
+                  .trimIndent()
+          )
+        }
+
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val versionString = strings.versionString
+    val hermesVersionString = strings.hermesVersionString
+    val hermesV1VersionString = strings.hermesV1VersionString
 
     assertThat(versionString).isEqualTo("0.0.0-20221101-2019-cfe811ab1-SNAPSHOT")
+    assertThat(hermesVersionString).isEqualTo("0.0.0-20221101-2019-cfe811ab1-SNAPSHOT")
+    assertThat(hermesV1VersionString).isEqualTo("250829098.0.0-stable")
   }
 
   @Test
@@ -431,8 +625,23 @@ class DependencyUtilsTest {
           )
         }
 
-    val versionString = readVersionAndGroupStrings(propertiesFile).first
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+        ANOTHER_PROPERTY=true
+      """
+                  .trimIndent()
+          )
+        }
+
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val versionString = strings.versionString
+    val hermesVersionString = strings.hermesVersionString
+    val hermesV1VersionString = strings.hermesV1VersionString
     assertThat(versionString).isEqualTo("")
+    assertThat(hermesVersionString).isEqualTo("")
+    assertThat(hermesV1VersionString).isEqualTo("")
   }
 
   @Test
@@ -448,8 +657,24 @@ class DependencyUtilsTest {
           )
         }
 
-    val versionString = readVersionAndGroupStrings(propertiesFile).first
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+        HERMES_V1_VERSION_NAME=
+        ANOTHER_PROPERTY=true
+      """
+                  .trimIndent()
+          )
+        }
+
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val versionString = strings.versionString
+    val hermesVersionString = strings.hermesVersionString
+    val hermesV1VersionString = strings.hermesV1VersionString
     assertThat(versionString).isEqualTo("")
+    assertThat(hermesVersionString).isEqualTo("")
+    assertThat(hermesV1VersionString).isEqualTo("")
   }
 
   @Test
@@ -459,15 +684,30 @@ class DependencyUtilsTest {
           writeText(
               """
         react.internal.publishingGroup=io.github.test
+        react.internal.hermesPublishingGroup=io.github.test
         ANOTHER_PROPERTY=true
       """
                   .trimIndent()
           )
         }
 
-    val groupString = readVersionAndGroupStrings(propertiesFile).second
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+        HERMES_V1_VERSION_NAME=
+        ANOTHER_PROPERTY=true
+      """
+                  .trimIndent()
+          )
+        }
 
-    assertThat(groupString).isEqualTo("io.github.test")
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val reactGroupString = strings.reactGroupString
+    val hermesGroupString = strings.hermesGroupString
+
+    assertThat(reactGroupString).isEqualTo("io.github.test")
+    assertThat(hermesGroupString).isEqualTo("io.github.test")
   }
 
   @Test
@@ -482,9 +722,23 @@ class DependencyUtilsTest {
           )
         }
 
-    val groupString = readVersionAndGroupStrings(propertiesFile).second
+    val hermesVersionFile =
+        tempFolder.newFile("version.properties").apply {
+          writeText(
+              """
+        HERMES_V1_VERSION_NAME=
+        ANOTHER_PROPERTY=true
+      """
+                  .trimIndent()
+          )
+        }
 
-    assertThat(groupString).isEqualTo("com.facebook.react")
+    val strings = readVersionAndGroupStrings(propertiesFile, hermesVersionFile)
+    val reactGroupString = strings.reactGroupString
+    val hermesGroupString = strings.hermesGroupString
+
+    assertThat(reactGroupString).isEqualTo("com.facebook.react")
+    assertThat(hermesGroupString).isEqualTo("com.facebook.hermes")
   }
 
   @Test

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

@@ -162,6 +162,16 @@ class PathUtilsTest {
     assertThat(detectOSAwareHermesCommand(tempFolder.root, "")).isEqualTo(expected.toString())
   }
 
+  @Test
+  @WithOs(OS.MAC)
+  fun detectOSAwareHermesCommand_withHermesV1Enabled() {
+    tempFolder.newFolder("node_modules/hermes-compiler/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,6 +14,7 @@ import com.facebook.react.tests.createProject
 import com.facebook.react.utils.ProjectUtils.getReactNativeArchitectures
 import com.facebook.react.utils.ProjectUtils.isEdgeToEdgeEnabled
 import com.facebook.react.utils.ProjectUtils.isHermesEnabled
+import com.facebook.react.utils.ProjectUtils.isHermesV1Enabled
 import com.facebook.react.utils.ProjectUtils.isNewArchEnabled
 import com.facebook.react.utils.ProjectUtils.needsCodegenFromPackageJson
 import java.io.File
@@ -115,6 +116,32 @@ class ProjectUtilsTest {
     assertThat(project.isEdgeToEdgeEnabled).isFalse()
   }
 
+  @Test
+  fun isHermesV1Enabled_returnsFalseByDefault() {
+    assertThat(createProject().isHermesV1Enabled).isFalse()
+  }
+
+  @Test
+  fun isHermesV1Enabled_withDisabledViaProperty_returnsFalse() {
+    val project = createProject()
+    project.extensions.extraProperties.set("hermesV1Enabled", "false")
+    assertThat(project.isHermesV1Enabled).isFalse()
+  }
+
+  @Test
+  fun isHermesV1Enabled_withEnabledViaProperty_returnsTrue() {
+    val project = createProject()
+    project.extensions.extraProperties.set("hermesV1Enabled", "true")
+    assertThat(project.isHermesV1Enabled).isTrue()
+  }
+
+  @Test
+  fun isHermesV1Enabled_withInvalidViaProperty_returnsFalse() {
+    val project = createProject()
+    project.extensions.extraProperties.set("hermesV1Enabled", "¯\\_(ツ)_/¯")
+    assertThat(project.isHermesV1Enabled).isFalse()
+  }
+
   @Test
   fun needsCodegenFromPackageJson_withCodegenConfigInPackageJson_returnsTrue() {
     val project = createProject()

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

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

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

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

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

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

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

@@ -54,7 +54,7 @@ RCTAppSetupDefaultRootView(RCTBridge *bridge, NSString *moduleName, NSDictionary
 NSArray<NSString *> *RCTAppSetupUnstableModulesRequiringMainQueueSetup(id<RCTDependencyProvider> dependencyProvider)
 {
   // For oss, insert core main queue setup modules here
-  return dependencyProvider ? dependencyProvider.unstableModulesRequiringMainQueueSetup : @[];
+  return (dependencyProvider != nullptr) ? dependencyProvider.unstableModulesRequiringMainQueueSetup : @[];
 }
 
 id<RCTTurboModule> RCTAppSetupDefaultModuleFromClass(Class moduleClass, id<RCTDependencyProvider> dependencyProvider)
@@ -65,11 +65,11 @@ id<RCTTurboModule> RCTAppSetupDefaultModuleFromClass(Class moduleClass, id<RCTDe
         NSArray<NSString *> *classNames = @[];
 
         if (protocol == @protocol(RCTImageURLLoader)) {
-          classNames = dependencyProvider ? dependencyProvider.imageURLLoaderClassNames : @[];
+          classNames = (dependencyProvider != nullptr) ? dependencyProvider.imageURLLoaderClassNames : @[];
         } else if (protocol == @protocol(RCTImageDataDecoder)) {
-          classNames = dependencyProvider ? dependencyProvider.imageDataDecoderClassNames : @[];
+          classNames = (dependencyProvider != nullptr) ? dependencyProvider.imageDataDecoderClassNames : @[];
         } else if (protocol == @protocol(RCTURLRequestHandler)) {
-          classNames = dependencyProvider ? dependencyProvider.URLRequestHandlerClassNames : @[];
+          classNames = (dependencyProvider != nullptr) ? dependencyProvider.URLRequestHandlerClassNames : @[];
         }
 
         NSMutableArray *modules = [NSMutableArray new];

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

@@ -78,7 +78,7 @@
 
 - (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents
 {
-  return self.dependencyProvider ? self.dependencyProvider.thirdPartyFabricComponents : @{};
+  return (self.dependencyProvider != nullptr) ? self.dependencyProvider.thirdPartyFabricComponents : @{};
 }
 
 - (void)hostDidStart:(RCTHost *)host
@@ -87,13 +87,15 @@
 
 - (NSArray<NSString *> *)unstableModulesRequiringMainQueueSetup
 {
-  return self.dependencyProvider ? RCTAppSetupUnstableModulesRequiringMainQueueSetup(self.dependencyProvider) : @[];
+  return (self.dependencyProvider != nullptr)
+      ? RCTAppSetupUnstableModulesRequiringMainQueueSetup(self.dependencyProvider)
+      : @[];
 }
 
 - (nullable id<RCTModuleProvider>)getModuleProvider:(const char *)name
 {
   NSString *providerName = [NSString stringWithCString:name encoding:NSUTF8StringEncoding];
-  return self.dependencyProvider ? self.dependencyProvider.moduleProviders[providerName] : nullptr;
+  return (self.dependencyProvider != nullptr) ? self.dependencyProvider.moduleProviders[providerName] : nullptr;
 }
 
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name

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

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

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

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

packages/react-native/Libraries/Blob/RCTBlobCollector.mm

@@ -31,7 +31,7 @@ void RCTBlobCollector::install(RCTBlobManager *blobManager)
   __weak RCTCxxBridge *cxxBridge = (RCTCxxBridge *)blobManager.bridge;
   [cxxBridge
       dispatchBlock:^{
-        if (!cxxBridge || cxxBridge.runtime == nullptr) {
+        if ((cxxBridge == nullptr) || cxxBridge.runtime == nullptr) {
           return;
         }
         jsi::Runtime &runtime = *(jsi::Runtime *)cxxBridge.runtime;

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

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

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

@@ -29,6 +29,16 @@ 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,6 +6,7 @@
  *
  * @flow
  * @format
+ * @deprecated
  */
 
 import NativeTiming from './NativeTiming';

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

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

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

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

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

@@ -50,8 +50,8 @@ RCT_EXPORT_MODULE()
                                           completionHandler:(RCTImageLoaderCompletionBlock)completionHandler
 {
   UIImage *image = RCTImageFromLocalAssetURL(imageURL);
-  if (image) {
-    if (progressHandler) {
+  if (image != nullptr) {
+    if (progressHandler != nullptr) {
       progressHandler(1, 1);
     }
     completionHandler(nil, image);

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

@@ -27,7 +27,7 @@ RCT_EXPORT_MODULE()
   char header[7] = {};
   [imageData getBytes:header length:6];
 
-  return !strcmp(header, "GIF87a") || !strcmp(header, "GIF89a");
+  return (strcmp(header, "GIF87a") == 0) || (strcmp(header, "GIF89a") == 0);
 }
 
 - (RCTImageLoaderCancellationBlock)decodeImageData:(NSData *)imageData
@@ -38,7 +38,7 @@ RCT_EXPORT_MODULE()
 {
   RCTAnimatedImage *image = [[RCTAnimatedImage alloc] initWithData:imageData scale:scale];
 
-  if (!image) {
+  if (image == nullptr) {
     completionHandler(nil, nil);
     return ^{
     };

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

@@ -19,7 +19,7 @@ UIImage *RCTBlurredImageWithRadius(UIImage *inputImage, CGFloat radius)
   }
 
   // convert to ARGB if it isn't
-  if (CGImageGetBitsPerPixel(imageRef) != 32 || !((CGImageGetBitmapInfo(imageRef) & kCGBitmapAlphaInfoMask))) {
+  if (CGImageGetBitsPerPixel(imageRef) != 32 || (((CGImageGetBitmapInfo(imageRef) & kCGBitmapAlphaInfoMask)) == 0u)) {
     UIGraphicsImageRendererFormat *const rendererFormat = [UIGraphicsImageRendererFormat defaultFormat];
     rendererFormat.scale = inputImage.scale;
     UIGraphicsImageRenderer *const renderer = [[UIGraphicsImageRenderer alloc] initWithSize:inputImage.size
@@ -30,17 +30,18 @@ UIImage *RCTBlurredImageWithRadius(UIImage *inputImage, CGFloat radius)
                }].CGImage;
   }
 
-  vImage_Buffer buffer1, buffer2;
+  vImage_Buffer buffer1;
+  vImage_Buffer buffer2;
   buffer1.width = buffer2.width = CGImageGetWidth(imageRef);
   buffer1.height = buffer2.height = CGImageGetHeight(imageRef);
   buffer1.rowBytes = buffer2.rowBytes = CGImageGetBytesPerRow(imageRef);
   size_t bytes = buffer1.rowBytes * buffer1.height;
   buffer1.data = malloc(bytes);
-  if (!buffer1.data) {
+  if (buffer1.data == nullptr) {
     return inputImage;
   }
   buffer2.data = malloc(bytes);
-  if (!buffer2.data) {
+  if (buffer2.data == nullptr) {
     free(buffer1.data);
     return inputImage;
   }
@@ -60,7 +61,7 @@ UIImage *RCTBlurredImageWithRadius(UIImage *inputImage, CGFloat radius)
     return inputImage;
   }
   void *tempBuffer = malloc(tempBufferSize);
-  if (!tempBuffer) {
+  if (tempBuffer == nullptr) {
     free(buffer1.data);
     free(buffer2.data);
     return inputImage;

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

@@ -48,7 +48,7 @@ RCT_EXPORT_MODULE()
 {
   dispatch_async(_methodQueue, ^{
     [self removeImageForTag:imageTag];
-    if (block) {
+    if (block != nullptr) {
       block();
     }
   });
@@ -58,7 +58,7 @@ RCT_EXPORT_MODULE()
 {
   RCTAssertThread(_methodQueue, @"Must be called on RCTImageStoreManager thread");
 
-  if (!_store) {
+  if (_store == nullptr) {
     _store = [NSMutableDictionary new];
     _id = 0;
   }
@@ -112,7 +112,7 @@ RCT_EXPORT_METHOD(getBase64ForTag
                   : (RCTResponseSenderBlock)errorCallback)
 {
   NSData *imageData = _store[imageTag];
-  if (!imageData) {
+  if (imageData == nullptr) {
     errorCallback(
         @[ RCTJSErrorFromNSError(RCTErrorWithMessage([NSString stringWithFormat:@"Invalid imageTag: %@", imageTag])) ]);
     return;
@@ -132,7 +132,7 @@ RCT_EXPORT_METHOD(addImageFromBase64
   // Dispatching to a background thread to perform base64 decoding
   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     NSData *imageData = [[NSData alloc] initWithBase64EncodedString:base64String options:0];
-    if (imageData) {
+    if (imageData != nullptr) {
       dispatch_async(self->_methodQueue, ^{
         successCallback(@[ [self _storeImageData:imageData] ]);
       });
@@ -164,14 +164,14 @@ RCT_EXPORT_METHOD(addImageFromBase64
 
     NSString *imageTag = request.URL.absoluteString;
     NSData *imageData = self->_store[imageTag];
-    if (!imageData) {
+    if (imageData == nullptr) {
       NSError *error = RCTErrorWithMessage([NSString stringWithFormat:@"Invalid imageTag: %@", imageTag]);
       [delegate URLRequest:cancellationBlock didCompleteWithError:error];
       return;
     }
 
     CGImageSourceRef sourceRef = CGImageSourceCreateWithData((__bridge CFDataRef)imageData, NULL);
-    if (!sourceRef) {
+    if (sourceRef == nullptr) {
       NSError *error =
           RCTErrorWithMessage([NSString stringWithFormat:@"Unable to decode data for imageTag: %@", imageTag]);
       [delegate URLRequest:cancellationBlock didCompleteWithError:error];
@@ -197,7 +197,7 @@ RCT_EXPORT_METHOD(addImageFromBase64
 
 - (void)cancelRequest:(id)requestToken
 {
-  if (requestToken) {
+  if (requestToken != nullptr) {
     ((void (^)(void))requestToken)();
   }
 }

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

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

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

@@ -50,8 +50,8 @@ RCT_EXPORT_MODULE()
                                           completionHandler:(RCTImageLoaderCompletionBlock)completionHandler
 {
   UIImage *image = RCTImageFromLocalAssetURL(imageURL);
-  if (image) {
-    if (progressHandler) {
+  if (image != nullptr) {
+    if (progressHandler != nullptr) {
       progressHandler(1, 1);
     }
     completionHandler(nil, image);

packages/react-native/Libraries/LinkingIOS/RCTLinkingManager.mm

@@ -155,7 +155,7 @@ RCT_EXPORT_METHOD(canOpenURL
 RCT_EXPORT_METHOD(getInitialURL : (RCTPromiseResolveBlock)resolve reject : (__unused RCTPromiseRejectBlock)reject)
 {
   NSURL *initialURL = nil;
-  if (self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey]) {
+  if (self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey] != nullptr) {
     initialURL = self.bridge.launchOptions[UIApplicationLaunchOptionsURLKey];
   } else {
     NSDictionary *userActivityDictionary =

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

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

packages/react-native/Libraries/NativeAnimation/Drivers/RCTEventAnimation.mm

@@ -13,7 +13,7 @@
 
 - (instancetype)initWithEventPath:(NSArray<NSString *> *)eventPath valueNode:(RCTValueAnimatedNode *)valueNode
 {
-  if ((self = [super init])) {
+  if ((self = [super init]) != nullptr) {
     _eventPath = eventPath;
     _valueNode = valueNode;
   }

packages/react-native/Libraries/NativeAnimation/Nodes/RCTAnimatedNode.mm

@@ -16,7 +16,7 @@
 
 - (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
-  if ((self = [super init])) {
+  if ((self = [super init]) != nullptr) {
     _nodeTag = tag;
     _config = [config copy];
   }
@@ -37,10 +37,10 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (void)addChild:(RCTAnimatedNode *)child
 {
-  if (!_childNodes) {
+  if (_childNodes == nullptr) {
     _childNodes = [NSMapTable strongToWeakObjectsMapTable];
   }
-  if (child) {
+  if (child != nullptr) {
     [_childNodes setObject:child forKey:child.nodeTag];
     [child onAttachedToNode:self];
   }
@@ -48,10 +48,10 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (void)removeChild:(RCTAnimatedNode *)child
 {
-  if (!_childNodes) {
+  if (_childNodes == nullptr) {
     return;
   }
-  if (child) {
+  if (child != nullptr) {
     [_childNodes removeObjectForKey:child.nodeTag];
     [child onDetachedFromNode:self];
   }
@@ -59,20 +59,20 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (void)onAttachedToNode:(RCTAnimatedNode *)parent
 {
-  if (!_parentNodes) {
+  if (_parentNodes == nullptr) {
     _parentNodes = [NSMapTable strongToWeakObjectsMapTable];
   }
-  if (parent) {
+  if (parent != nullptr) {
     [_parentNodes setObject:parent forKey:parent.nodeTag];
   }
 }
 
 - (void)onDetachedFromNode:(RCTAnimatedNode *)parent
 {
-  if (!_parentNodes) {
+  if (_parentNodes == nullptr) {
     return;
   }
-  if (parent) {
+  if (parent != nullptr) {
     [_parentNodes removeObjectForKey:parent.nodeTag];
   }
 }

packages/react-native/Libraries/NativeAnimation/Nodes/RCTInterpolationAnimatedNode.mm

@@ -86,7 +86,7 @@ NSString *RCTInterpolateString(
 
 - (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
-  if ((self = [super initWithTag:tag config:config])) {
+  if ((self = [super initWithTag:tag config:config]) != nullptr) {
     _inputRange = config[@"inputRange"];
 
     NSArray *outputRangeConfig = config[@"outputRange"];
@@ -104,7 +104,7 @@ NSString *RCTInterpolateString(
       switch (_outputType) {
         case RCTInterpolationOutputColor: {
           UIColor *color = [RCTConvert UIColor:value];
-          [outputRange addObject:color ? color : [UIColor whiteColor]];
+          [outputRange addObject:(color != nullptr) ? color : [UIColor whiteColor]];
           break;
         }
         case RCTInterpolationOutputString:
@@ -141,7 +141,7 @@ NSString *RCTInterpolateString(
 - (void)performUpdate
 {
   [super performUpdate];
-  if (!_parentNode) {
+  if (_parentNode == nullptr) {
     return;
   }
 

packages/react-native/Libraries/NativeAnimation/Nodes/RCTObjectAnimatedNode.mm

@@ -48,7 +48,7 @@ NSString *const NODE_TAG_KEY = @"nodeTag";
   if ([value isKindOfClass:[NSDictionary class]]) {
     NSDictionary<NSString *, id> *dict = (NSDictionary *)value;
     id nodeTag = [dict objectForKey:NODE_TAG_KEY];
-    if (nodeTag && [nodeTag isKindOfClass:[NSNumber class]]) {
+    if ((nodeTag != nullptr) && [nodeTag isKindOfClass:[NSNumber class]]) {
       RCTAnimatedNode *node = [self.parentNodes objectForKey:(NSNumber *)nodeTag];
       if ([node isKindOfClass:[RCTValueAnimatedNode class]]) {
         RCTValueAnimatedNode *valueNode = (RCTValueAnimatedNode *)node;

packages/react-native/Libraries/NativeAnimation/Nodes/RCTStyleAnimatedNode.mm

@@ -18,7 +18,7 @@
 
 - (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
-  if ((self = [super initWithTag:tag config:config])) {
+  if ((self = [super initWithTag:tag config:config]) != nullptr) {
     _propsDictionary = [NSMutableDictionary new];
   }
   return self;
@@ -36,11 +36,11 @@
   NSDictionary<NSString *, NSNumber *> *style = self.config[@"style"];
   [style enumerateKeysAndObjectsUsingBlock:^(NSString *property, NSNumber *nodeTag, __unused BOOL *stop) {
     RCTAnimatedNode *node = [self.parentNodes objectForKey:nodeTag];
-    if (node) {
+    if (node != nullptr) {
       if ([node isKindOfClass:[RCTValueAnimatedNode class]]) {
         RCTValueAnimatedNode *valueAnimatedNode = (RCTValueAnimatedNode *)node;
         id animatedObject = valueAnimatedNode.animatedObject;
-        if (animatedObject) {
+        if (animatedObject != nullptr) {
           _propsDictionary[property] = animatedObject;
         } else {
           _propsDictionary[property] = @(valueAnimatedNode.value);

packages/react-native/Libraries/NativeAnimation/Nodes/RCTTrackingAnimatedNode.mm

@@ -18,7 +18,7 @@
 
 - (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
-  if ((self = [super initWithTag:tag config:config])) {
+  if ((self = [super initWithTag:tag config:config]) != nullptr) {
     _animationId = config[@"animationId"];
     _toValueNodeTag = config[@"toValue"];
     _valueNodeTag = config[@"value"];

packages/react-native/Libraries/NativeAnimation/Nodes/RCTTransformAnimatedNode.mm

@@ -14,7 +14,7 @@
 
 - (instancetype)initWithTag:(NSNumber *)tag config:(NSDictionary<NSString *, id> *)config
 {
-  if ((self = [super initWithTag:tag config:config])) {
+  if ((self = [super initWithTag:tag config:config]) != nullptr) {
     _propsDictionary = [NSMutableDictionary new];
   }
   return self;

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

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

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

@@ -59,7 +59,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
 - (instancetype)initWithBridge:(nullable RCTBridge *)bridge
               surfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
 {
-  if ((self = [super init])) {
+  if ((self = [super init]) != nullptr) {
     _bridge = bridge;
     _surfacePresenter = surfacePresenter;
     _animationNodes = [NSMutableDictionary new];
@@ -72,7 +72,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
 - (BOOL)isNodeManagedByFabric:(NSNumber *)tag
 {
   RCTAnimatedNode *node = _animationNodes[tag];
-  if (node) {
+  if (node != nullptr) {
     return [node isManagedByFabric];
   }
   return false;
@@ -106,7 +106,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
   NSString *nodeType = [RCTConvert NSString:config[@"type"]];
 
   Class nodeClass = map[nodeType];
-  if (!nodeClass) {
+  if (nodeClass == nullptr) {
     RCTLogError(@"Animated node type %@ not supported natively", nodeType);
     return;
   }
@@ -187,7 +187,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
 - (void)dropAnimatedNode:(NSNumber *)tag
 {
   RCTAnimatedNode *node = _animationNodes[tag];
-  if (node) {
+  if (node != nullptr) {
     [node detachNode];
     [_animationNodes removeObjectForKey:tag];
   }
@@ -345,7 +345,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
   NSNumber *nodeTag = [RCTConvert NSNumber:eventMapping[@"animatedValueTag"]];
   RCTAnimatedNode *node = _animationNodes[nodeTag];
 
-  if (!node) {
+  if (node == nullptr) {
     RCTLogError(@"Animated node with tag %@ does not exist", nodeTag);
     return;
   }
@@ -407,7 +407,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
 
   NSString *key = [NSString stringWithFormat:@"%@%@", event.viewTag, RCTNormalizeAnimatedEventName(event.eventName)];
   NSMutableArray<RCTEventAnimation *> *driversForKey = _eventDrivers[key];
-  if (driversForKey) {
+  if (driversForKey != nullptr) {
     for (RCTEventAnimation *driver in driversForKey) {
       [self stopAnimationsForNode:driver.valueNode];
       [driver updateWithEvent:event];
@@ -439,7 +439,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
 
 - (void)startAnimationLoopIfNeeded
 {
-  if (!_displayLink && _activeAnimations.count > 0) {
+  if ((_displayLink == nullptr) && _activeAnimations.count > 0) {
     _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(stepAnimations:)];
     [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
   }
@@ -454,7 +454,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
 
 - (void)stopAnimationLoop
 {
-  if (_displayLink) {
+  if (_displayLink != nullptr) {
     [_displayLink invalidate];
     _displayLink = nil;
   }
@@ -486,7 +486,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
   NSArray<RCTEventAnimation *> *eventAnimations = _eventDrivers[key];
   for (RCTEventAnimation *animation in eventAnimations) {
     NSNumber *nodeTag = [animation.valueNode nodeTag];
-    if (nodeTag) {
+    if (nodeTag != nullptr) {
       [tags addObject:nodeTag];
     }
     for (NSNumber *childNodeKey in [animation.valueNode childNodes]) {

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

@@ -25,7 +25,7 @@ RCT_EXPORT_MODULE()
 - (void)invalidate
 {
   std::lock_guard<std::mutex> lock(_operationHandlerMutexLock);
-  if (_queue) {
+  if (_queue != nullptr) {
     for (NSOperation *operation in _queue.operations) {
       if (!operation.isCancelled && !operation.isFinished) {
         [operation cancel];
@@ -44,7 +44,7 @@ RCT_EXPORT_MODULE()
 {
   std::lock_guard<std::mutex> lock(_operationHandlerMutexLock);
   // Lazy setup
-  if (!_queue) {
+  if (_queue == nullptr) {
     _queue = [NSOperationQueue new];
     _queue.maxConcurrentOperationCount = 2;
   }
@@ -59,7 +59,7 @@ RCT_EXPORT_MODULE()
     // Get mime type
     NSRange firstSemicolon = [request.URL.resourceSpecifier rangeOfString:@";"];
     NSString *mimeType =
-        firstSemicolon.length ? [request.URL.resourceSpecifier substringToIndex:firstSemicolon.location] : nil;
+        (firstSemicolon.length != 0u) ? [request.URL.resourceSpecifier substringToIndex:firstSemicolon.location] : nil;
 
     // Send response
     NSURLResponse *response = [[NSURLResponse alloc] initWithURL:request.URL
@@ -72,7 +72,7 @@ RCT_EXPORT_MODULE()
     // Load data
     NSError *error;
     NSData *data = [NSData dataWithContentsOfURL:request.URL options:NSDataReadingMappedIfSafe error:&error];
-    if (data) {
+    if (data != nullptr) {
       [delegate URLRequest:strongOp didReceiveData:data];
     }
     [delegate URLRequest:strongOp didCompleteWithError:error];

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

@@ -46,7 +46,7 @@ RCT_EXPORT_MODULE()
 - (BOOL)isValid
 {
   // if session == nil and delegates != nil, we've been invalidated
-  return _session || !_delegates;
+  return (_session != nullptr) || (_delegates == nullptr);
 }
 
 #pragma mark - NSURLRequestHandler
@@ -67,7 +67,7 @@ RCT_EXPORT_MODULE()
 {
   std::lock_guard<std::mutex> lock(_mutex);
   // Lazy setup
-  if (!_session && [self isValid]) {
+  if ((_session == nullptr) && [self isValid]) {
     // You can override default NSURLSession instance property allowsCellularAccess (default value YES)
     //  by providing the following key to your RN project (edit ios/project/Info.plist file in Xcode):
     // <key>ReactNetworkForceWifiOnly</key>    <true/>
@@ -80,12 +80,12 @@ RCT_EXPORT_MODULE()
     callbackQueue.maxConcurrentOperationCount = 1;
     callbackQueue.underlyingQueue = [[_moduleRegistry moduleForName:"Networking"] methodQueue];
     NSURLSessionConfiguration *configuration;
-    if (urlSessionConfigurationProvider) {
+    if (urlSessionConfigurationProvider != nullptr) {
       configuration = urlSessionConfigurationProvider();
     } else {
       configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
       // Set allowsCellularAccess to NO ONLY if key ReactNetworkForceWifiOnly exists AND its value is YES
-      if (useWifiOnly) {
+      if (useWifiOnly != nullptr) {
         configuration.allowsCellularAccess = ![useWifiOnly boolValue];
       }
       [configuration setHTTPShouldSetCookies:YES];

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

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

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

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

packages/react-native/Libraries/Settings/RCTSettingsManager.mm

@@ -39,7 +39,7 @@ RCT_EXPORT_MODULE()
 
 - (instancetype)initWithUserDefaults:(NSUserDefaults *)defaults
 {
-  if ((self = [super init])) {
+  if ((self = [super init]) != nullptr) {
     _defaults = defaults;
 
     [[NSNotificationCenter defaultCenter] addObserver:self
@@ -84,7 +84,7 @@ RCT_EXPORT_METHOD(setValues : (NSDictionary *)values)
   _ignoringUpdates = YES;
   [values enumerateKeysAndObjectsUsingBlock:^(NSString *key, id json, BOOL *stop) {
     id plist = [RCTConvert NSPropertyList:json];
-    if (plist) {
+    if (plist != nullptr) {
       [self->_defaults setObject:plist forKey:key];
     } else {
       [self->_defaults removeObjectForKey:key];

packages/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm

@@ -141,7 +141,7 @@ RCT_EXPORT_METHOD(setTextAndSelection
     RCTExecuteOnUIManagerQueue(^{
       RCTBaseTextInputShadowView *shadowView =
           (RCTBaseTextInputShadowView *)[self.bridge.uiManager shadowViewForReactTag:viewTag];
-      if (value) {
+      if (value != nullptr) {
         [shadowView setText:value];
       }
       [self.bridge.uiManager setNeedsLayout];

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

@@ -65,6 +65,16 @@ 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);
-  typedef typename facebook::react::LazyVector<T>::size_type _size_t;
+  using _size_t = typename facebook::react::LazyVector<T>::size_type;
   _size_t size = static_cast<_size_t>(array.count);
   return facebook::react::LazyVector<T>::fromUnsafeRawValue(array, size, ctor);
 }

packages/react-native/Libraries/TypeSafety/RCTTypedModuleConstants.mm

@@ -16,7 +16,7 @@
 + (instancetype)newWithUnsafeDictionary:(NSDictionary<NSString *, id> *)dictionary
 {
   _RCTTypedModuleConstants *constants = [self new];
-  if (constants) {
+  if (constants != nullptr) {
     constants->_dictionary = dictionary;
   }
   return constants;

packages/react-native/Package.swift

@@ -68,6 +68,17 @@ 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,
@@ -211,6 +222,18 @@ 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,
@@ -304,6 +327,13 @@ 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,
@@ -420,7 +450,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]
+  dependencies: [.reactNativeDependencies, .reactCore, .reactRCTImage, .yoga, .reactRCTText, .jsi, .reactFabricComponents, .reactGraphics, .reactImageManager, .reactDebug, .reactUtils, .reactPerformanceTimeline, .reactRendererDebug, .reactRendererConsistency, .reactRuntimeScheduler, .reactRCTAnimation, .reactJsInspector, .reactJsInspectorNetwork, .reactJsInspectorTracing, .reactFabric, .reactFabricImage, .rctSwiftUIWrapper]
 )
 
 /// React-FabricComponents.podspec
@@ -560,12 +590,15 @@ let targets = [
   reactCore,
   reactCoreRCTWebsocket,
   reactFabric,
+  rctSwiftUI,
+  rctSwiftUIWrapper,
   reactRCTFabric,
   reactFabricComponents,
   reactFabricImage,
   reactNativeDependencies,
   hermesPrebuilt,
   reactJsiTooling,
+  reactNetworking,
   reactPerformanceCdpMetrics,
   reactPerformanceTimeline,
   reactRuntimeScheduler,
@@ -590,6 +623,7 @@ let targets = [
   reactTurboModuleCoreDefaults,
   reactTurboModuleCoreMicrotasks,
   reactIdleCallbacksNativeModule,
+  reactWebPerformanceNativeModule,
   reactFeatureflagsNativemodule,
   reactNativeModuleDom,
   reactAppDelegate,
@@ -707,6 +741,9 @@ 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"
@@ -737,6 +774,7 @@ 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"
@@ -764,6 +802,7 @@ 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,6 +69,7 @@ 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                   \
@@ -80,6 +81,17 @@ 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/RCTBridgeProxy.mm

@@ -53,7 +53,7 @@ using namespace facebook;
                        launchOptions:(nullable NSDictionary *)launchOptions
 {
   self = [super self];
-  if (self) {
+  if (self != nullptr) {
     _uiManagerProxy = [[RCTUIManagerProxy alloc] initWithViewRegistry:viewRegistry];
     _moduleRegistry = moduleRegistry;
     _bundleManager = bundleManager;
@@ -75,7 +75,7 @@ using namespace facebook;
 
   if (queue == RCTJSThread) {
     _dispatchToJSThread(block);
-  } else if (queue) {
+  } else if (queue != nullptr) {
     dispatch_async(queue, block);
   }
 }
@@ -427,7 +427,7 @@ using namespace facebook;
 - (instancetype)initWithViewRegistry:(RCTViewRegistry *)viewRegistry
 {
   self = [super self];
-  if (self) {
+  if (self != nullptr) {
     _viewRegistry = viewRegistry;
     _legacyViewRegistry = [NSMutableDictionary new];
   }
@@ -443,8 +443,8 @@ using namespace facebook;
 {
   [self logWarning:@"Please migrate to RCTViewRegistry: @synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED."
                cmd:_cmd];
-  UIView *view = [_viewRegistry viewForReactTag:reactTag] ? [_viewRegistry viewForReactTag:reactTag]
-                                                          : [_legacyViewRegistry objectForKey:reactTag];
+  UIView *view = ([_viewRegistry viewForReactTag:reactTag] != nullptr) ? [_viewRegistry viewForReactTag:reactTag]
+                                                                       : [_legacyViewRegistry objectForKey:reactTag];
   return RCTPaperViewOrCurrentView(view);
 }
 
@@ -457,7 +457,7 @@ using namespace facebook;
   __weak __typeof(self) weakSelf = self;
   RCTExecuteOnMainQueue(^{
     __typeof(self) strongSelf = weakSelf;
-    if (strongSelf) {
+    if (strongSelf != nullptr) {
       RCTUIManager *proxiedManager = (RCTUIManager *)strongSelf;
       RCTComposedViewRegistry *composedViewRegistry =
           [[RCTComposedViewRegistry alloc] initWithUIManager:proxiedManager

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);
 
-  typedef int (*DeflateInit2_)(z_streamp, int, int, int, int, int, const char *, int);
+  using DeflateInit2_ = int (*)(z_streamp, int, int, int, int, int, const char *, int);
   DeflateInit2_ deflateInit2_ = (DeflateInit2_)dlsym(libz, "deflateInit2_");
 
-  typedef int (*Deflate)(z_streamp, int);
+  using Deflate = int (*)(z_streamp, int);
   Deflate deflate = (Deflate)dlsym(libz, "deflate");
 
-  typedef int (*DeflateEnd)(z_streamp);
+  using DeflateEnd = int (*)(z_streamp);
   DeflateEnd deflateEnd = (DeflateEnd)dlsym(libz, "deflateEnd");
 
   z_stream stream;

packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceSizeMeasureMode.mm

@@ -18,17 +18,17 @@ void RCTSurfaceMinimumSizeAndMaximumSizeFromSizeAndSizeMeasureMode(
   *minimumSize = CGSizeZero;
   *maximumSize = CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX);
 
-  if (sizeMeasureMode & RCTSurfaceSizeMeasureModeWidthExact) {
+  if ((sizeMeasureMode & RCTSurfaceSizeMeasureModeWidthExact) != 0) {
     minimumSize->width = size.width;
     maximumSize->width = size.width;
-  } else if (sizeMeasureMode & RCTSurfaceSizeMeasureModeWidthAtMost) {
+  } else if ((sizeMeasureMode & RCTSurfaceSizeMeasureModeWidthAtMost) != 0) {
     maximumSize->width = size.width;
   }
 
-  if (sizeMeasureMode & RCTSurfaceSizeMeasureModeHeightExact) {
+  if ((sizeMeasureMode & RCTSurfaceSizeMeasureModeHeightExact) != 0) {
     minimumSize->height = size.height;
     maximumSize->height = size.height;
-  } else if (sizeMeasureMode & RCTSurfaceSizeMeasureModeHeightAtMost) {
+  } else if ((sizeMeasureMode & RCTSurfaceSizeMeasureModeHeightAtMost) != 0) {
     maximumSize->height = size.height;
   }
 }

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

@@ -31,7 +31,7 @@ using namespace facebook::react;
 - (instancetype)init
 {
   self = [super init];
-  if (self) {
+  if (self != nullptr) {
     _alertControllers = [NSMutableArray new];
   }
   return self;
@@ -53,7 +53,7 @@ RCT_EXPORT_MODULE()
   alertController.modalPresentationStyle = UIModalPresentationPopover;
   UIView *sourceView = parentViewController.view;
 
-  if (anchorViewTag) {
+  if (anchorViewTag != nullptr) {
     sourceView = [self.viewRegistry_DEPRECATED viewForReactTag:anchorViewTag];
   } else {
     alertController.popoverPresentationController.permittedArrowDirections = 0;
@@ -166,12 +166,12 @@ RCT_EXPORT_METHOD(showActionSheetWithOptions
       index++;
     }
 
-    if (disabledButtonIndices) {
+    if (disabledButtonIndices != nullptr) {
       for (NSNumber *disabledButtonIndex in disabledButtonIndices) {
         if ([disabledButtonIndex integerValue] < buttons.count) {
           UIAlertAction *action = alertController.actions[[disabledButtonIndex integerValue]];
           [action setEnabled:false];
-          if (disabledButtonTintColor) {
+          if (disabledButtonTintColor != nullptr) {
             [action setValue:disabledButtonTintColor forKey:@"titleTextColor"];
           }
         } else {
@@ -235,14 +235,14 @@ RCT_EXPORT_METHOD(showShareActionSheetWithOptions
   UIColor *tintColor = [RCTConvert UIColor:options.tintColor() ? @(*options.tintColor()) : nil];
 
   dispatch_async(dispatch_get_main_queue(), ^{
-    if (message) {
+    if (message != nullptr) {
       [items addObject:message];
     }
-    if (URL) {
+    if (URL != nullptr) {
       if ([URL.scheme.lowercaseString isEqualToString:@"data"]) {
         NSError *error;
         NSData *data = [NSData dataWithContentsOfURL:URL options:(NSDataReadingOptions)0 error:&error];
-        if (!data) {
+        if (data == nullptr) {
           failureCallback(@[ RCTJSErrorFromNSError(error) ]);
           return;
         }
@@ -258,17 +258,17 @@ RCT_EXPORT_METHOD(showShareActionSheetWithOptions
 
     UIActivityViewController *shareController = [[UIActivityViewController alloc] initWithActivityItems:items
                                                                                   applicationActivities:nil];
-    if (subject) {
+    if (subject != nullptr) {
       [shareController setValue:subject forKey:@"subject"];
     }
-    if (excludedActivityTypes) {
+    if (excludedActivityTypes != nullptr) {
       shareController.excludedActivityTypes = excludedActivityTypes;
     }
 
     UIViewController *controller = RCTPresentedViewController();
     shareController.completionWithItemsHandler =
         ^(NSString *activityType, BOOL completed, __unused NSArray *returnedItems, NSError *activityError) {
-          if (activityError) {
+          if (activityError != nullptr) {
             failureCallback(@[ RCTJSErrorFromNSError(activityError) ]);
           } else if (completed || activityType == nil) {
             successCallback(@[ @(completed), RCTNullIfNil(activityType) ]);

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

@@ -27,7 +27,7 @@
       _alertWindow = [[UIWindow alloc] initWithFrame:UIScreen.mainScreen.bounds];
     }
 
-    if (_alertWindow) {
+    if (_alertWindow != nullptr) {
       _alertWindow.rootViewController = [UIViewController new];
       _alertWindow.windowLevel = UIWindowLevelAlert + 1;
     }
@@ -41,7 +41,7 @@
   UIUserInterfaceStyle style = self.overrideUserInterfaceStyle;
   if (style == UIUserInterfaceStyleUnspecified) {
     UIUserInterfaceStyle overriddenStyle = RCTKeyWindow().overrideUserInterfaceStyle;
-    style = overriddenStyle ? overriddenStyle : UIUserInterfaceStyleUnspecified;
+    style = (overriddenStyle != 0) ? overriddenStyle : UIUserInterfaceStyleUnspecified;
   }
 
   self.overrideUserInterfaceStyle = style;

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

@@ -86,7 +86,7 @@ RCT_EXPORT_METHOD(alertWithArgs : (JS::NativeAlertManager::Args &)args callback
   UIKeyboardType keyboardType = [RCTConvert UIKeyboardType:args.keyboardType()];
   UIUserInterfaceStyle userInterfaceStyle = [RCTConvert UIUserInterfaceStyle:args.userInterfaceStyle()];
 
-  if (!title && !message) {
+  if ((title == nullptr) && (message == nullptr)) {
     RCTLogError(@"Must specify either an alert title, or message, or both");
     return;
   }
@@ -193,7 +193,7 @@ RCT_EXPORT_METHOD(alertWithArgs : (JS::NativeAlertManager::Args &)args callback
       }
     }
 
-    if (!self->_alertControllers) {
+    if (self->_alertControllers == nullptr) {
       self->_alertControllers = [NSHashTable weakObjectsHashTable];
     }
     [self->_alertControllers addObject:alertController];

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

@@ -47,7 +47,7 @@ NSString *const RCTShowDevMenuNotification = @"RCTShowDevMenuNotification";
 
 - (instancetype)initWithTitleBlock:(RCTDevMenuItemTitleBlock)titleBlock handler:(dispatch_block_t)handler
 {
-  if ((self = [super init])) {
+  if ((self = [super init]) != nullptr) {
     _titleBlock = [titleBlock copy];
     _handler = [handler copy];
   }
@@ -72,14 +72,14 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
 
 - (void)callHandler
 {
-  if (_handler) {
+  if (_handler != nullptr) {
     _handler();
   }
 }
 
 - (NSString *)title
 {
-  if (_titleBlock) {
+  if (_titleBlock != nullptr) {
     return _titleBlock();
   }
   return nil;
@@ -120,7 +120,7 @@ RCT_EXPORT_MODULE()
 
 - (instancetype)init
 {
-  if ((self = [super init])) {
+  if ((self = [super init]) != nullptr) {
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(showOnShake)
                                                  name:RCTShowDevMenuNotification
@@ -214,7 +214,7 @@ RCT_EXPORT_MODULE()
   if (_actionSheet.isBeingPresented || _actionSheet.beingDismissed) {
     return;
   }
-  if (_actionSheet) {
+  if (_actionSheet != nullptr) {
     [_actionSheet dismissViewControllerAnimated:YES
                                      completion:^(void) {
                                        self->_actionSheet = nil;
@@ -379,7 +379,7 @@ RCT_EXPORT_MODULE()
 
 RCT_EXPORT_METHOD(show)
 {
-  if (_actionSheet || RCTRunningInAppExtension()) {
+  if ((_actionSheet != nullptr) || RCTRunningInAppExtension()) {
     return;
   }
 
@@ -412,7 +412,7 @@ RCT_EXPORT_METHOD(show)
 - (RCTDevMenuAlertActionHandler)alertActionHandlerForDevItem:(RCTDevMenuItem *__nullable)item
 {
   return ^(__unused UIAlertAction *action) {
-    if (item) {
+    if (item != nullptr) {
       [item callHandler];
     }
 

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

@@ -238,11 +238,10 @@ static NSDictionary *RCTExportedDimensions(CGFloat fontScale)
 - (void)interfaceOrientationDidChange
 {
 #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST
-  UIApplication *application = RCTSharedApplication();
-  UIInterfaceOrientation nextOrientation = RCTKeyWindow().windowScene.interfaceOrientation;
+  UIWindow *window = RCTKeyWindow();
+  UIInterfaceOrientation nextOrientation = window.windowScene.interfaceOrientation;
 
-  BOOL isRunningInFullScreen =
-      CGRectEqualToRect(application.delegate.window.frame, application.delegate.window.screen.bounds);
+  BOOL isRunningInFullScreen = window ? CGRectEqualToRect(window.frame, window.screen.bounds) : YES;
   // 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->