[0.71.0-rc.3] Bump version numbers

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

In 0.71.0-RC.2, we had a regression in `use_frameworks!`.

This adds some CircleCI jobs to make sure we do not regress on those. It also updates the template to support these tests.

## Changelog
[iOS][Added] - CircleCI jobs to keep the use_framework! setup in check for the Old Arch

Reviewed By: cortinico

Differential Revision: D41551288

fbshipit-source-id: 531fabb1a7b6aceab2926bb83cf2887129df1776

.circleci/Dockerfiles/Dockerfile.android

@@ -14,7 +14,7 @@
 # and build a Android application that can be used to run the
 # tests specified in the scripts/ directory.
 #
-FROM reactnativecommunity/react-native-android:6.0
+FROM reactnativecommunity/react-native-android:6.1
 
 LABEL Description="React Native Android Test Image"
 LABEL maintainer="Héctor Ramos <hector@fb.com>"

.circleci/config.yml

@@ -48,15 +48,15 @@ references:
   # Anchors for the cache keys
 
   cache_keys:
-    checkout_cache_key: &checkout_cache_key v1-checkout
+    checkout_cache_key: &checkout_cache_key v5-checkout
     gems_cache_key: &gems_cache_key v1-gems-{{ checksum "Gemfile.lock" }}
     gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "ReactAndroid/gradle.properties" }}
     hermes_workspace_cache_key: &hermes_workspace_cache_key v4-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
     hermes_workspace_debug_cache_key: &hermes_workspace_debug_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-debug-{{ checksum "/tmp/hermes/hermesversion" }}
     hermes_workspace_release_cache_key: &hermes_workspace_release_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-release-{{ checksum "/tmp/hermes/hermesversion" }}
     hermes_windows_cache_key: &hermes_windows_cache_key v3-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "tmp/hermes/hermesversion" }}
-    hermes_tarball_debug_cache_key: &hermes_tarball_debug_cache_key v2-hermes-tarball-debug-{{ checksum "/tmp/hermes/hermesversion" }}
-    hermes_tarball_release_cache_key: &hermes_tarball_release_cache_key v1-hermes-tarball-release-{{ checksum "/tmp/hermes/hermesversion" }}
+    hermes_tarball_debug_cache_key: &hermes_tarball_debug_cache_key v3-hermes-tarball-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version"}}
+    hermes_tarball_release_cache_key: &hermes_tarball_release_cache_key v2-hermes-tarball-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version"}}
     pods_cache_key: &pods_cache_key v8-pods-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile.lock.bak" }}-{{ checksum "packages/rn-tester/Podfile" }}
     windows_yarn_cache_key: &windows_yarn_cache_key v1-win-yarn-cache-{{ arch }}-{{ checksum "yarn.lock" }}
     yarn_cache_key: &yarn_cache_key v5-yarn-cache-{{ .Environment.CIRCLE_JOB }}
@@ -102,7 +102,7 @@ executors:
   reactnativeandroid:
     <<: *defaults
     docker:
-      - image: reactnativecommunity/react-native-android:6.0
+      - image: reactnativecommunity/react-native-android:6.1
     resource_class: "xlarge"
     environment:
       - TERM: "dumb"
@@ -132,10 +132,7 @@ commands:
         type: string
     steps:
       - restore_cache:
-            keys:
-              - << parameters.checkout_base_cache_key >>-{{ arch }}-{{ .Branch }}-{{ .Revision }}
-              - << parameters.checkout_base_cache_key >>-{{ arch }}-{{ .Branch }}-
-              - << parameters.checkout_base_cache_key >>-{{ arch }}-
+          key: << parameters.checkout_base_cache_key >>-{{ arch }}-{{ .Branch }}-{{ .Revision }}
       - checkout
       - save_cache:
           key: << parameters.checkout_base_cache_key >>-{{ arch }}-{{ .Branch }}-{{ .Revision }}
@@ -275,6 +272,12 @@ commands:
         type: string
         default: *hermes_tarball_artifacts_dir
     steps:
+      - run:
+          name: Get React Native version
+          command: |
+            VERSION=$( grep '"version"' package.json | cut -d '"' -f 4 | head -1)
+            # Save the react native version we are building in a file so we can use that file as part of the cache key.
+            echo "$VERSION" > /tmp/react-native-version
       - when:
           condition:
             equal: [ << parameters.flavor >>, "Debug"]
@@ -306,8 +309,8 @@ commands:
                     exit 0
                   fi
 
-                  TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>" --releaseVersion "*")
-                  TARBALL_PATH=$(ls $HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME)
+                  TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
+                  TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME
 
                   echo "Looking for $TARBALL_FILENAME in $HERMES_TARBALL_ARTIFACTS_DIR"
                   echo "$TARBALL_PATH"
@@ -828,6 +831,11 @@ jobs:
         description: Whether Flipper is enabled. Must be one of "WithFlipper", "WithoutFlipper".
         type: enum
         enum: ["WithFlipper", "WithoutFlipper"]
+      use_frameworks:
+        default: "StaticLibraries"
+        description: Which kind of option we want to use for `use_frameworks!`
+        type: enum
+        enum: ["StaticLibraries", "StaticFrameworks"] #TODO: Add "DynamicFrameworks"
     environment:
       - PROJECT_NAME: "iOSTemplateProject"
       - HERMES_WS_DIR: *hermes_workspace_root
@@ -842,6 +850,24 @@ jobs:
           steps:
             - run:
                 command: circleci-agent step halt # this interrupts the job successfully.
+      # use_frameworks! does not works with Flipper enabled
+      - when:
+          condition:
+            and:
+              - equal: [ << parameters.use_frameworks >>, "StaticFrameworks"]
+              - equal: [ << parameters.flipper >>, "WithFlipper" ]
+          steps:
+            - run:
+                command: circleci-agent step halt # this interrupts the job successfully.
+      # use_frameworks! does not works with the New Architecture enabled
+      - when:
+          condition:
+            and:
+              - equal: [ << parameters.use_frameworks >>, "StaticFrameworks"]
+              - equal: [ << parameters.architecture >>, "NewArch" ]
+          steps:
+            - run:
+                command: circleci-agent step halt # this interrupts the job successfully.
       # Valid configuration, we can continue
       - checkout_code_with_cache
       - run_yarn
@@ -855,7 +881,9 @@ jobs:
             - run:
                 name: Set HERMES_ENGINE_TARBALL_PATH
                 command: |
-                  echo "export HERMES_ENGINE_TARBALL_PATH=$(ls -AU $HERMES_WS_DIR/hermes-runtime-darwin/hermes-runtime-darwin-*.tar.gz | head -1)" >> $BASH_ENV
+                  BUILD_TYPE="<< parameters.flavor >>"
+                  TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
+                  echo "export HERMES_ENGINE_TARBALL_PATH=$HERMES_WS_DIR/hermes-runtime-darwin/$TARBALL_FILENAME" >> $BASH_ENV
       - run:
           name: Create iOS template project
           command: |
@@ -889,6 +917,10 @@ jobs:
               export NO_FLIPPER=1
             fi
 
+            if [[ << parameters.use_frameworks >> == "StaticFrameworks" ]]; then
+              export USE_FRAMEWORKS=static
+            fi
+
             bundle exec pod install
       - run:
           name: Build template project
@@ -967,8 +999,8 @@ jobs:
     environment:
       - ANDROID_HOME: "C:\\Android\\android-sdk"
       - ANDROID_NDK: "C:\\Android\\android-sdk\\ndk\\20.1.5948944"
-      - ANDROID_BUILD_VERSION: 31
-      - ANDROID_TOOLS_VERSION: 31.0.0
+      - ANDROID_BUILD_VERSION: 33
+      - ANDROID_TOOLS_VERSION: 33.0.0
       - GRADLE_OPTS: -Dorg.gradle.daemon=false
     steps:
       - checkout_code_with_cache
@@ -1211,9 +1243,6 @@ jobs:
                       command: |
                         cd ./sdks/hermes || exit 1
                         BUILD_TYPE="<< parameters.flavor >>" ./utils/build-mac-framework.sh
-            - with_hermesc_span:
-                flavor: << parameters.flavor >>
-                steps:
                   - run:
                       name: Build the Hermes iOS frameworks
                       command: |
@@ -1227,20 +1256,13 @@ jobs:
 
                   TARBALL_OUTPUT_DIR=$(mktemp -d /tmp/hermes-tarball-output-XXXXXXXX)
 
-                  # get_release_version() is defined in build-apple-framework.sh
-                  pushd ./sdks/hermes || exit 1
-                    BUILD_TYPE=$BUILD_TYPE source ./utils/build-apple-framework.sh
-                    RELEASE_VERSION=$(get_release_version)
-                  popd
-
-                  TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE" --releaseVersion "$RELEASE_VERSION")
+                  TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js --buildType "$BUILD_TYPE")
 
                   echo "Packaging Hermes Apple frameworks for $BUILD_TYPE build type"
 
                   TARBALL_OUTPUT_PATH=$(node ./scripts/hermes/create-tarball.js \
                     --inputDir ./sdks/hermes \
                     --buildType "$BUILD_TYPE" \
-                    --releaseVersion "$RELEASE_VERSION" \
                     --outputDir $TARBALL_OUTPUT_DIR)
 
                   echo "Hermes tarball saved to $TARBALL_OUTPUT_PATH"
@@ -1371,7 +1393,14 @@ jobs:
       - run:
           name: "Set new react-native version and commit changes"
           command: |
-            node ./scripts/prepare-package-for-release.js -v << parameters.version >> -l << parameters.latest >> --dry-run << parameters.dryrun >>
+            VERSION=<< parameters.version >>
+
+            if [[ -z "$VERSION" ]]; then
+              VERSION=$(grep '"version"' package.json | cut -d '"' -f 4 | head -1)
+              echo "Using the version from the package.json: $VERSION"
+            fi
+
+            node ./scripts/prepare-package-for-release.js -v "$VERSION" -l << parameters.latest >> --dry-run << parameters.dryrun >>
 
   build_npm_package:
     parameters:
@@ -1409,8 +1438,8 @@ jobs:
             cp -r $HERMES_WS_DIR/win64-bin/* ./sdks/hermesc/win64-bin/.
             cp -r $HERMES_WS_DIR/linux64-bin/* ./sdks/hermesc/linux64-bin/.
             mkdir -p ./ReactAndroid/external-artifacts/artifacts/
-            cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-runtime-darwin-debug-*.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-debug.tar.gz
-            cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-runtime-darwin-release-*.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-release.tar.gz
+            cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-debug.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-debug.tar.gz
+            cp $HERMES_WS_DIR/hermes-runtime-darwin/hermes-ios-release.tar.gz ./ReactAndroid/external-artifacts/artifacts/hermes-ios-release.tar.gz
 
       - run_yarn
       - download_gradle_dependencies
@@ -1495,43 +1524,6 @@ jobs:
                     -d "{\"event_type\": \"publish\", \"client_payload\": { \"version\": \"${CIRCLE_TAG:1}\" }}"
       # END: Stable releases
 
-      # START: Stables and commitlies
-      - when:
-          condition:
-            or:
-              - equal: [ "release", << parameters.release_type >> ]
-              - equal: [ "dry-run", << parameters.release_type >> ]
-          steps:
-            - run:
-                name: Install dependencies
-                command: apt update && apt install -y jq jo
-            - run:
-                name: Create draft GitHub Release and upload Hermes binaries
-                command: |
-                  RELEASE_VERSION=$(cat build/.version)
-                  if [[ << parameters.release_type >> == "release" ]]; then
-                    GIT_TAG=$CIRCLE_TAG
-                  elif [[ << parameters.release_type >> == "dry-run" ]]; then
-                    GIT_TAG=v1000.0.0
-                  fi
-
-                  ARTIFACTS=("")
-                  for build_type in "Debug" "Release"; do
-                    TARBALL_FILENAME=$(node ./scripts/hermes/get-tarball-name.js \
-                      --buildType $build_type \
-                      --releaseVersion $RELEASE_VERSION)
-
-                    ARTIFACTS+=("$HERMES_WS_DIR/hermes-runtime-darwin/$TARBALL_FILENAME")
-                  done
-
-                  ./scripts/circleci/create_github_release.sh \
-                    << parameters.release_type >> \
-                    $GIT_TAG \
-                    $RELEASE_VERSION \
-                    $GITHUB_TOKEN \
-                    "${ARTIFACTS[@]}"
-      # END: Stable and commitlies
-
   # -------------------------
   #    JOBS: Nightly
   # -------------------------
@@ -1616,6 +1608,7 @@ workflows:
               flavor: ["Debug", "Release"]
               jsengine: ["Hermes", "JSC"]
               flipper: ["WithFlipper", "WithoutFlipper"]
+              use_frameworks: [ "StaticLibraries", "StaticFrameworks" ] #TODO: make it works with DynamicFrameworks
       - test_ios_rntester:
           requires:
             - build_hermes_macos
@@ -1688,7 +1681,7 @@ workflows:
     jobs:
       - prepare_package_for_release:
           name: prepare_package_for_release
-          version: 'v1000.0.1'
+          version: ''
           latest : false
           dryrun: true
       - prepare_hermes_workspace:

.gitignore

@@ -64,7 +64,8 @@ buck-out
 .gradle
 local.properties
 *.iml
-/android/
+/android/*
+!/android/README.md
 
 # Node
 node_modules

BUCK

@@ -10,6 +10,9 @@ load(
 )
 load(
     "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "CXX",
     "HERMES_BYTECODE_VERSION",
     "IOS",
     "RCT_IMAGE_DATA_DECODER_SOCKET",
@@ -112,7 +115,7 @@ rn_xplat_cxx_library2(
         react_native_root_target("React/CoreModules:CoreModules"),
         react_native_xplat_target("cxxreact:bridge"),
         react_native_xplat_target("cxxreact:jsbigstring"),
-        react_native_xplat_target("jsi:JSCRuntime"),
+        react_native_xplat_target("jsc:JSCRuntime"),
         react_native_xplat_target("jsiexecutor:jsiexecutor"),
         react_native_xplat_target("reactperflogger:reactperflogger"),
     ],
@@ -264,6 +267,7 @@ REACT_PUBLIC_HEADERS = {
     "React/RCTDevLoadingViewProtocol.h": RCTDEVSUPPORT_PATH + "RCTDevLoadingViewProtocol.h",
     "React/RCTDevLoadingViewSetEnabled.h": RCTDEVSUPPORT_PATH + "RCTDevLoadingViewSetEnabled.h",
     "React/RCTDisplayLink.h": RCTBASE_PATH + "RCTDisplayLink.h",
+    "React/RCTDynamicTypeRamp.h": RCTLIB_PATH + "Text/Text/RCTDynamicTypeRamp.h",
     "React/RCTErrorCustomizer.h": RCTBASE_PATH + "RCTErrorCustomizer.h",
     "React/RCTErrorInfo.h": RCTBASE_PATH + "RCTErrorInfo.h",
     # NOTE: RCTEventDispatcher.h is exported from CoreModules:CoreModulesApple
@@ -1453,3 +1457,28 @@ rn_xplat_cxx_library2(
         "//fbobjc/VendorLib/react-native-maps:react-native-maps",
     ],
 )
+
+rn_xplat_cxx_library2(
+    name = "RCTWebPerformance",
+    srcs = glob([
+        "Libraries/WebPerformance/**/*.cpp",
+    ]),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [("Libraries/WebPerformance", "*.h")],
+        prefix = "RCTWebPerformance",
+    ),
+    fbandroid_compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+    ],
+    labels = [
+        "depslint_never_remove",
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+    ],
+    platforms = (ANDROID, APPLE, CXX),
+    visibility = ["PUBLIC"],
+    deps = [
+        ":FBReactNativeSpecJSI",
+    ],
+)

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby '2.7.6'
+ruby File.read(File.join(__dir__, '.ruby-version')).strip
 
 gem 'cocoapods', '~> 1.11', '>= 1.11.3'

Gemfile.lock

@@ -56,7 +56,7 @@ GEM
     colored2 (3.1.2)
     concurrent-ruby (1.1.10)
     escape (0.0.4)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
     ffi (1.15.5)
     fourflusher (2.3.1)
@@ -85,16 +85,16 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (~> 3.2.4)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (~> 1.11, >= 1.11.2)
+  cocoapods (~> 1.11, >= 1.11.3)
 
 RUBY VERSION
-   ruby 2.7.5p203
+   ruby 2.7.6p219
 
 BUNDLED WITH
    2.3.22

Libraries/Core/ReactNativeVersion.js

@@ -10,8 +10,8 @@
  */
 
 exports.version = {
-  major: 1000,
-  minor: 0,
+  major: 0,
+  minor: 71,
   patch: 0,
-  prerelease: null,
+  prerelease: 'rc.3',
 };

Libraries/Image/ImagePickerIOS.d.ts

@@ -1,48 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-export interface OpenCameraDialogOptions {
-  /** Defaults to false */
-  videoMode?: boolean | undefined;
-}
-
-export interface OpenSelectDialogOptions {
-  /** Defaults to true */
-  showImages?: boolean | undefined;
-  /** Defaults to false */
-  showVideos?: boolean | undefined;
-}
-
-/** [imageURL|tempImageTag, height, width] */
-export type ImagePickerResult = [string, number, number];
-
-export interface ImagePickerIOSStatic {
-  canRecordVideos(callback: (value: boolean) => void): void;
-  canUseCamera(callback: (value: boolean) => void): void;
-  openCameraDialog(
-    config: OpenCameraDialogOptions,
-    successCallback: (args: ImagePickerResult) => void,
-    cancelCallback: (args: any[]) => void,
-  ): void;
-  openSelectDialog(
-    config: OpenSelectDialogOptions,
-    successCallback: (args: ImagePickerResult) => void,
-    cancelCallback: (args: any[]) => void,
-  ): void;
-}
-
-/**
- * ImagePickerIOS has been extracted from react-native core and will be removed in a future release.
- * Please upgrade to use either `@react-native-community/react-native-image-picker` or 'expo-image-picker'.
- * If you cannot upgrade to a different library, please install the deprecated `@react-native-community/image-picker-ios` package.
- * @see https://github.com/react-native-community/react-native-image-picker-ios
- * @deprecated
- */
-export const ImagePickerIOS: ImagePickerIOSStatic;
-export type ImagePickerIOS = ImagePickerIOSStatic;

Libraries/Image/ImagePickerIOS.js

@@ -1,103 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow strict-local
- */
-
-import NativeImagePickerIOS from './NativeImagePickerIOS';
-import invariant from 'invariant';
-
-const ImagePickerIOS = {
-  canRecordVideos: function (callback: (result: boolean) => void): void {
-    invariant(NativeImagePickerIOS, 'ImagePickerIOS is not available');
-    return NativeImagePickerIOS.canRecordVideos(callback);
-  },
-  canUseCamera: function (callback: (result: boolean) => void): void {
-    invariant(NativeImagePickerIOS, 'ImagePickerIOS is not available');
-    return NativeImagePickerIOS.canUseCamera(callback);
-  },
-  openCameraDialog: function (
-    config: $ReadOnly<{|
-      unmirrorFrontFacingCamera?: boolean,
-      videoMode?: boolean,
-    |}>,
-    successCallback: (imageURL: string, height: number, width: number) => void,
-    cancelCallback: () => void,
-  ): void {
-    invariant(NativeImagePickerIOS, 'ImagePickerIOS is not available');
-
-    var newConfig = {
-      videoMode: true,
-      unmirrorFrontFacingCamera: false,
-    };
-
-    if (config.videoMode != null) {
-      newConfig.videoMode = config.videoMode;
-    }
-
-    if (config.unmirrorFrontFacingCamera != null) {
-      newConfig.unmirrorFrontFacingCamera = config.unmirrorFrontFacingCamera;
-    }
-
-    return NativeImagePickerIOS.openCameraDialog(
-      newConfig,
-      successCallback,
-      cancelCallback,
-    );
-  },
-  openSelectDialog: function (
-    config: $ReadOnly<{|
-      showImages?: boolean,
-      showVideos?: boolean,
-    |}>,
-    successCallback: (imageURL: string, height: number, width: number) => void,
-    cancelCallback: () => void,
-  ): void {
-    invariant(NativeImagePickerIOS, 'ImagePickerIOS is not available');
-
-    var newConfig = {
-      showImages: true,
-      showVideos: false,
-    };
-
-    if (config.showImages != null) {
-      newConfig.showImages = config.showImages;
-    }
-
-    if (config.showVideos != null) {
-      newConfig.showVideos = config.showVideos;
-    }
-
-    return NativeImagePickerIOS.openSelectDialog(
-      newConfig,
-      successCallback,
-      cancelCallback,
-    );
-  },
-  /**
-   * In iOS 13, the video URLs returned by the Image Picker are invalidated when
-   * the picker is dismissed, unless reference to it is held. This API allows
-   * the application to signal when it's finished with the video so that the
-   * reference can be cleaned up.
-   * It is safe to call this method for urlsthat aren't video URLs;
-   * it will be a no-op.
-   */
-  removePendingVideo: function (url: string): void {
-    invariant(NativeImagePickerIOS, 'ImagePickerIOS is not available');
-    NativeImagePickerIOS.removePendingVideo(url);
-  },
-  /**
-   * WARNING: In most cases, removePendingVideo should be used instead because
-   * clearAllPendingVideos could clear out pending videos made by other callers.
-   */
-  clearAllPendingVideos: function (): void {
-    invariant(NativeImagePickerIOS, 'ImagePickerIOS is not available');
-    NativeImagePickerIOS.clearAllPendingVideos();
-  },
-};
-
-module.exports = ImagePickerIOS;

Libraries/Image/NativeImagePickerIOS.js

@@ -1,39 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict
- * @format
- */
-
-import type {TurboModule} from '../TurboModule/RCTExport';
-
-import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
-
-export interface Spec extends TurboModule {
-  +getConstants: () => {||};
-  +canRecordVideos: (callback: (result: boolean) => void) => void;
-  +canUseCamera: (callback: (result: boolean) => void) => void;
-  +openCameraDialog: (
-    config: {|
-      unmirrorFrontFacingCamera: boolean,
-      videoMode: boolean,
-    |},
-    successCallback: (imageURL: string, height: number, width: number) => void,
-    cancelCallback: () => void,
-  ) => void;
-  +openSelectDialog: (
-    config: {|
-      showImages: boolean,
-      showVideos: boolean,
-    |},
-    successCallback: (imageURL: string, height: number, width: number) => void,
-    cancelCallback: () => void,
-  ) => void;
-  +clearAllPendingVideos: () => void;
-  +removePendingVideo: (url: string) => void;
-}
-
-export default (TurboModuleRegistry.get<Spec>('ImagePickerIOS'): ?Spec);

Libraries/Performance/PerformanceObserver.js

@@ -1,124 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow strict
- */
-
-'use strict';
-
-export type Timestamp = number;
-export type PerformanceEntryType = 'event';
-
-export class PerformanceEntry {
-  name: string;
-  entryType: PerformanceEntryType;
-  startTime: Timestamp;
-  duration: number;
-
-  // For "event" entries only:
-  processingStart: ?Timestamp;
-  processingEnd: ?Timestamp;
-  interactionId: ?number;
-
-  // $FlowIgnore: Flow(unclear-type)
-  toJSON(): Object {
-    return {
-      name: this.name,
-      entryType: this.entryType,
-      startTime: this.startTime,
-      duration: this.duration,
-    };
-  }
-}
-
-export type PerformanceEntryList = $ReadOnlyArray<PerformanceEntry>;
-
-export class PerformanceObserverEntryList {
-  _entries: PerformanceEntryList;
-
-  constructor(entries: PerformanceEntryList) {
-    this._entries = entries;
-  }
-
-  getEntries(): PerformanceEntryList {
-    return this._entries;
-  }
-
-  getEntriesByType(type: PerformanceEntryType): PerformanceEntryList {
-    return this._entries.filter(entry => entry.entryType === type);
-  }
-
-  getEntriesByName(
-    name: string,
-    type?: PerformanceEntryType,
-  ): PerformanceEntryList {
-    if (type === undefined) {
-      return this._entries.filter(entry => entry.name === name);
-    } else {
-      return this._entries.filter(
-        entry => entry.name === name && entry.entryType === type,
-      );
-    }
-  }
-}
-
-export type PerformanceObserverCallback = (
-  list: PerformanceObserverEntryList,
-  observer: PerformanceObserver,
-) => void;
-
-export type PerformanceObserverInit =
-  | {
-      entryTypes: PerformanceEntryType[],
-      buffered?: boolean,
-    }
-  | {
-      type: PerformanceEntryType,
-      buffered?: boolean,
-    };
-
-/**
- * Implementation of the PerformanceObserver interface for RN,
- * corresponding to the standard in https://www.w3.org/TR/performance-timeline/
- *
- * @example
- * const observer = new PerformanceObserver((list, _observer) => {
- *   const entries = list.getEntries();
- *   entries.forEach(entry => {
- *     reportEvent({
- *       eventName: entry.name,
- *       startTime: entry.startTime,
- *       endTime: entry.startTime + entry.duration,
- *       processingStart: entry.processingStart,
- *       processingEnd: entry.processingEnd,
- *       interactionId: entry.interactionId,
- *     });
- *   });
- * });
- * observer.observe({ type: "event" });
- */
-export default class PerformanceObserver {
-  _callback: PerformanceObserverCallback;
-
-  constructor(callback: PerformanceObserverCallback) {
-    this._callback = callback;
-  }
-
-  observe(options: PerformanceObserverInit) {
-    console.log('PerformanceObserver: started observing');
-  }
-
-  disconnect(): void {
-    console.log('PerformanceObserver: stopped observing');
-  }
-
-  takeRecords(): PerformanceEntryList {
-    return [];
-  }
-
-  static supportedEntryTypes: PerformanceEntryType[] = ['event'];
-}

Libraries/Text/BaseText/RCTBaseTextViewManager.m

@@ -36,6 +36,7 @@ RCT_REMAP_SHADOW_PROPERTY(fontWeight, textAttributes.fontWeight, NSString)
 RCT_REMAP_SHADOW_PROPERTY(fontStyle, textAttributes.fontStyle, NSString)
 RCT_REMAP_SHADOW_PROPERTY(fontVariant, textAttributes.fontVariant, NSArray)
 RCT_REMAP_SHADOW_PROPERTY(allowFontScaling, textAttributes.allowFontScaling, BOOL)
+RCT_REMAP_SHADOW_PROPERTY(dynamicTypeRamp, textAttributes.dynamicTypeRamp, RCTDynamicTypeRamp)
 RCT_REMAP_SHADOW_PROPERTY(maxFontSizeMultiplier, textAttributes.maxFontSizeMultiplier, CGFloat)
 RCT_REMAP_SHADOW_PROPERTY(letterSpacing, textAttributes.letterSpacing, CGFloat)
 // Paragraph Styles

Libraries/Text/RCTTextAttributes.h

@@ -7,6 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
+#import <React/RCTDynamicTypeRamp.h>
 #import <React/RCTTextDecorationLineType.h>
 
 #import "RCTTextTransform.h"
@@ -36,6 +37,7 @@ extern NSString *const RCTTextAttributesTagAttributeName;
 @property (nonatomic, copy, nullable) NSString *fontStyle;
 @property (nonatomic, copy, nullable) NSArray<NSString *> *fontVariant;
 @property (nonatomic, assign) BOOL allowFontScaling;
+@property (nonatomic, assign) RCTDynamicTypeRamp dynamicTypeRamp;
 @property (nonatomic, assign) CGFloat letterSpacing;
 // Paragraph Styles
 @property (nonatomic, assign) CGFloat lineHeight;

Libraries/Text/RCTTextAttributes.m

@@ -59,6 +59,8 @@ NSString *const RCTTextAttributesTagAttributeName = @"RCTTextAttributesTagAttrib
   _fontStyle = textAttributes->_fontStyle ?: _fontStyle;
   _fontVariant = textAttributes->_fontVariant ?: _fontVariant;
   _allowFontScaling = textAttributes->_allowFontScaling || _allowFontScaling; // *
+  _dynamicTypeRamp = textAttributes->_dynamicTypeRamp != RCTDynamicTypeRampUndefined ? textAttributes->_dynamicTypeRamp
+                                                                                     : _dynamicTypeRamp;
   _letterSpacing = !isnan(textAttributes->_letterSpacing) ? textAttributes->_letterSpacing : _letterSpacing;
 
   // Paragraph Styles
@@ -230,6 +232,12 @@ NSString *const RCTTextAttributesTagAttributeName = @"RCTTextAttributesTagAttrib
 
   if (fontScalingEnabled) {
     CGFloat fontSizeMultiplier = !isnan(_fontSizeMultiplier) ? _fontSizeMultiplier : 1.0;
+    if (_dynamicTypeRamp != RCTDynamicTypeRampUndefined) {
+      UIFontMetrics *fontMetrics = RCTUIFontMetricsForDynamicTypeRamp(_dynamicTypeRamp);
+      // Using a specific font size reduces rounding errors from -scaledValueForValue:
+      CGFloat requestedSize = isnan(_fontSize) ? RCTBaseSizeForDynamicTypeRamp(_dynamicTypeRamp) : _fontSize;
+      fontSizeMultiplier = [fontMetrics scaledValueForValue:requestedSize] / requestedSize;
+    }
     CGFloat maxFontSizeMultiplier = !isnan(_maxFontSizeMultiplier) ? _maxFontSizeMultiplier : 0.0;
     return maxFontSizeMultiplier >= 1.0 ? fminf(maxFontSizeMultiplier, fontSizeMultiplier) : fontSizeMultiplier;
   } else {
@@ -324,7 +332,7 @@ static NSString *capitalizeText(NSString *text)
       RCTTextAttributesCompareFloats(_fontSizeMultiplier) && RCTTextAttributesCompareFloats(_maxFontSizeMultiplier) &&
       RCTTextAttributesCompareStrings(_fontWeight) && RCTTextAttributesCompareObjects(_fontStyle) &&
       RCTTextAttributesCompareObjects(_fontVariant) && RCTTextAttributesCompareOthers(_allowFontScaling) &&
-      RCTTextAttributesCompareFloats(_letterSpacing) &&
+      RCTTextAttributesCompareOthers(_dynamicTypeRamp) && RCTTextAttributesCompareFloats(_letterSpacing) &&
       // Paragraph Styles
       RCTTextAttributesCompareFloats(_lineHeight) && RCTTextAttributesCompareFloats(_alignment) &&
       RCTTextAttributesCompareOthers(_baseWritingDirection) && RCTTextAttributesCompareOthers(_lineBreakStrategy) &&

Libraries/Text/Text.d.ts

@@ -26,6 +26,23 @@ export interface TextPropsIOS {
    */
   adjustsFontSizeToFit?: boolean | undefined;
 
+  /**
+   * The Dynamic Text scale ramp to apply to this element on iOS.
+   */
+  dynamicTypeRamp?:
+    | 'caption2'
+    | 'caption1'
+    | 'footnote'
+    | 'subheadline'
+    | 'callout'
+    | 'body'
+    | 'headline'
+    | 'title3'
+    | 'title2'
+    | 'title1'
+    | 'largeTitle'
+    | undefined;
+
   /**
    * Specifies smallest possible scale a font can reach when adjustsFontSizeToFit is enabled. (values 0.01-1.0).
    */

Libraries/Text/Text/RCTDynamicTypeRamp.h

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import <React/RCTConvert.h>
+
+typedef NS_ENUM(NSInteger, RCTDynamicTypeRamp) {
+  RCTDynamicTypeRampUndefined,
+  RCTDynamicTypeRampCaption2,
+  RCTDynamicTypeRampCaption1,
+  RCTDynamicTypeRampFootnote,
+  RCTDynamicTypeRampSubheadline,
+  RCTDynamicTypeRampCallout,
+  RCTDynamicTypeRampBody,
+  RCTDynamicTypeRampHeadline,
+  RCTDynamicTypeRampTitle3,
+  RCTDynamicTypeRampTitle2,
+  RCTDynamicTypeRampTitle1,
+  RCTDynamicTypeRampLargeTitle
+};
+
+@interface RCTConvert (DynamicTypeRamp)
+
++ (RCTDynamicTypeRamp)RCTDynamicTypeRamp:(nullable id)json;
+
+@end
+
+/// Generates a `UIFontMetrics` instance representing a particular Dynamic Type ramp.
+UIFontMetrics *_Nonnull RCTUIFontMetricsForDynamicTypeRamp(RCTDynamicTypeRamp dynamicTypeRamp);
+/// The "reference" size for a particular font scale ramp, equal to a text element's size under default text size
+/// settings.
+CGFloat RCTBaseSizeForDynamicTypeRamp(RCTDynamicTypeRamp dynamicTypeRamp);

Libraries/Text/Text/RCTDynamicTypeRamp.m

@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTDynamicTypeRamp.h>
+
+@implementation RCTConvert (DynamicTypeRamp)
+
+RCT_ENUM_CONVERTER(
+    RCTDynamicTypeRamp,
+    (@{
+      @"caption2" : @(RCTDynamicTypeRampCaption2),
+      @"caption1" : @(RCTDynamicTypeRampCaption1),
+      @"footnote" : @(RCTDynamicTypeRampFootnote),
+      @"subheadline" : @(RCTDynamicTypeRampSubheadline),
+      @"callout" : @(RCTDynamicTypeRampCallout),
+      @"body" : @(RCTDynamicTypeRampBody),
+      @"headline" : @(RCTDynamicTypeRampHeadline),
+      @"title3" : @(RCTDynamicTypeRampTitle3),
+      @"title2" : @(RCTDynamicTypeRampTitle2),
+      @"title1" : @(RCTDynamicTypeRampTitle1),
+      @"largeTitle" : @(RCTDynamicTypeRampLargeTitle),
+    }),
+    RCTDynamicTypeRampUndefined,
+    integerValue)
+
+@end
+
+UIFontMetrics *RCTUIFontMetricsForDynamicTypeRamp(RCTDynamicTypeRamp dynamicTypeRamp)
+{
+  static NSDictionary<NSNumber *, UIFontTextStyle> *mapping;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    mapping = @{
+      @(RCTDynamicTypeRampCaption2) : UIFontTextStyleCaption2,
+      @(RCTDynamicTypeRampCaption1) : UIFontTextStyleCaption1,
+      @(RCTDynamicTypeRampFootnote) : UIFontTextStyleFootnote,
+      @(RCTDynamicTypeRampSubheadline) : UIFontTextStyleSubheadline,
+      @(RCTDynamicTypeRampCallout) : UIFontTextStyleCallout,
+      @(RCTDynamicTypeRampBody) : UIFontTextStyleBody,
+      @(RCTDynamicTypeRampHeadline) : UIFontTextStyleHeadline,
+      @(RCTDynamicTypeRampTitle3) : UIFontTextStyleTitle3,
+      @(RCTDynamicTypeRampTitle2) : UIFontTextStyleTitle2,
+      @(RCTDynamicTypeRampTitle1) : UIFontTextStyleTitle1,
+      @(RCTDynamicTypeRampLargeTitle) : UIFontTextStyleLargeTitle,
+    };
+  });
+
+  id textStyle =
+      mapping[@(dynamicTypeRamp)] ?: UIFontTextStyleBody; // Default to body if we don't recognize the specified ramp
+  return [UIFontMetrics metricsForTextStyle:textStyle];
+}
+
+CGFloat RCTBaseSizeForDynamicTypeRamp(RCTDynamicTypeRamp dynamicTypeRamp)
+{
+  static NSDictionary<NSNumber *, NSNumber *> *mapping;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    // Values taken from
+    // https://developer.apple.com/design/human-interface-guidelines/foundations/typography/#specifications
+    mapping = @{
+      @(RCTDynamicTypeRampCaption2) : @11,
+      @(RCTDynamicTypeRampCaption1) : @12,
+      @(RCTDynamicTypeRampFootnote) : @13,
+      @(RCTDynamicTypeRampSubheadline) : @15,
+      @(RCTDynamicTypeRampCallout) : @16,
+      @(RCTDynamicTypeRampBody) : @17,
+      @(RCTDynamicTypeRampHeadline) : @17,
+      @(RCTDynamicTypeRampTitle3) : @20,
+      @(RCTDynamicTypeRampTitle2) : @22,
+      @(RCTDynamicTypeRampTitle1) : @28,
+      @(RCTDynamicTypeRampLargeTitle) : @34,
+    };
+  });
+
+  NSNumber *baseSize =
+      mapping[@(dynamicTypeRamp)] ?: @17; // Default to body size if we don't recognize the specified ramp
+  return CGFLOAT_IS_DOUBLE ? [baseSize doubleValue] : [baseSize floatValue];
+}

Libraries/Text/TextNativeComponent.js

@@ -34,6 +34,7 @@ const textViewConfig = {
     numberOfLines: true,
     ellipsizeMode: true,
     allowFontScaling: true,
+    dynamicTypeRamp: true,
     maxFontSizeMultiplier: true,
     disabled: true,
     selectable: true,

Libraries/Text/TextProps.js

@@ -229,6 +229,23 @@ export type TextProps = $ReadOnly<{|
    */
   adjustsFontSizeToFit?: ?boolean,
 
+  /**
+   * The Dynamic Text scale ramp to apply to this element on iOS.
+   */
+  dynamicTypeRamp?: ?(
+    | 'caption2'
+    | 'caption1'
+    | 'footnote'
+    | 'subheadline'
+    | 'callout'
+    | 'body'
+    | 'headline'
+    | 'title3'
+    | 'title2'
+    | 'title1'
+    | 'largeTitle'
+  ),
+
   /**
    * Smallest possible scale a font can reach.
    *

Libraries/WebPerformance/NativePerformanceObserver.cpp

@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+#include "NativePerformanceObserver.h"
+#include <glog/logging.h>
+
+namespace facebook::react {
+
+NativePerformanceObserver::NativePerformanceObserver(
+    std::shared_ptr<CallInvoker> jsInvoker)
+    : NativePerformanceObserverCxxSpec(std::move(jsInvoker)) {}
+
+void NativePerformanceObserver::startReporting(
+    jsi::Runtime &rt,
+    std::string entryType) {
+  LOG(INFO) << "Started reporting perf entry type: " << entryType;
+}
+
+void NativePerformanceObserver::stopReporting(
+    jsi::Runtime &rt,
+    std::string entryType) {
+  LOG(INFO) << "Stopped reporting perf entry type: " << entryType;
+}
+
+std::vector<RawPerformanceEntry> NativePerformanceObserver::getPendingEntries(
+    jsi::Runtime &rt) {
+  return std::vector<RawPerformanceEntry>{};
+}
+
+void NativePerformanceObserver::setOnPerformanceEntryCallback(
+    jsi::Runtime &rt,
+    std::optional<AsyncCallback<>> callback) {
+  callback_ = callback;
+  LOG(INFO) << "setOnPerformanceEntryCallback: "
+            << (callback ? "non-empty" : "empty");
+}
+
+} // namespace facebook::react

Libraries/WebPerformance/NativePerformanceObserver.h

@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <FBReactNativeSpec/FBReactNativeSpecJSI.h>
+#include <functional>
+#include <memory>
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace facebook::react {
+
+#pragma mark - Structs
+
+using RawPerformanceEntry = NativePerformanceObserverCxxBaseRawPerformanceEntry<
+    std::string,
+    int32_t,
+    double,
+    double,
+    // For "event" entries only:
+    std::optional<double>,
+    std::optional<double>,
+    std::optional<double>>;
+
+template <>
+struct Bridging<RawPerformanceEntry>
+    : NativePerformanceObserverCxxBaseRawPerformanceEntryBridging<
+          std::string,
+          int32_t,
+          double,
+          double,
+          std::optional<double>,
+          std::optional<double>,
+          std::optional<double>> {};
+
+#pragma mark - implementation
+
+class NativePerformanceObserver
+    : public NativePerformanceObserverCxxSpec<NativePerformanceObserver>,
+      std::enable_shared_from_this<NativePerformanceObserver> {
+ public:
+  NativePerformanceObserver(std::shared_ptr<CallInvoker> jsInvoker);
+
+  void startReporting(jsi::Runtime &rt, std::string entryType);
+
+  void stopReporting(jsi::Runtime &rt, std::string entryType);
+
+  std::vector<RawPerformanceEntry> getPendingEntries(jsi::Runtime &rt);
+
+  void setOnPerformanceEntryCallback(
+      jsi::Runtime &rt,
+      std::optional<AsyncCallback<>> callback);
+
+ private:
+  std::optional<AsyncCallback<>> callback_;
+};
+
+} // namespace facebook::react

Libraries/WebPerformance/NativePerformanceObserver.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 strict
+ * @format
+ */
+
+import type {TurboModule} from '../TurboModule/RCTExport';
+
+import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
+
+export const RawPerformanceEntryTypeValues = {
+  UNDEFINED: 0,
+};
+
+export type RawPerformanceEntryType = number;
+
+export type RawPerformanceEntry = {|
+  name: string,
+  entryType: RawPerformanceEntryType,
+  startTime: number,
+  duration: number,
+  // For "event" entries only:
+  processingStart?: number,
+  processingEnd?: number,
+  interactionId?: number,
+|};
+
+export interface Spec extends TurboModule {
+  +startReporting: (entryType: string) => void;
+  +stopReporting: (entryType: string) => void;
+  +getPendingEntries: () => $ReadOnlyArray<RawPerformanceEntry>;
+  +setOnPerformanceEntryCallback: (callback?: () => void) => void;
+}
+
+export default (TurboModuleRegistry.get<Spec>(
+  'NativePerformanceObserverCxx',
+): ?Spec);

Libraries/WebPerformance/PerformanceObserver.js

@@ -0,0 +1,223 @@
+/**
+ * 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.
+ *
+ * @format
+ * @flow strict
+ */
+
+import type {
+  RawPerformanceEntry,
+  RawPerformanceEntryType,
+} from './NativePerformanceObserver';
+
+import warnOnce from '../Utilities/warnOnce';
+import NativePerformanceObserver from './NativePerformanceObserver';
+
+export type HighResTimeStamp = number;
+// TODO: Extend once new types (such as event) are supported.
+// TODO: Get rid of the "undefined" once there is at least one type supported.
+export type PerformanceEntryType = 'undefined';
+
+export class PerformanceEntry {
+  name: string;
+  entryType: PerformanceEntryType;
+  startTime: HighResTimeStamp;
+  duration: number;
+
+  constructor(init: {
+    name: string,
+    entryType: PerformanceEntryType,
+    startTime: HighResTimeStamp,
+    duration: number,
+  }) {
+    this.name = init.name;
+    this.entryType = init.entryType;
+    this.startTime = init.startTime;
+    this.duration = init.duration;
+  }
+
+  // $FlowIgnore: Flow(unclear-type)
+  toJSON(): Object {
+    return {
+      name: this.name,
+      entryType: this.entryType,
+      startTime: this.startTime,
+      duration: this.duration,
+    };
+  }
+}
+
+function rawToPerformanceEntryType(
+  type: RawPerformanceEntryType,
+): PerformanceEntryType {
+  return 'undefined';
+}
+
+function rawToPerformanceEntry(entry: RawPerformanceEntry): PerformanceEntry {
+  return new PerformanceEntry({
+    name: entry.name,
+    entryType: rawToPerformanceEntryType(entry.entryType),
+    startTime: entry.startTime,
+    duration: entry.duration,
+  });
+}
+
+export type PerformanceEntryList = $ReadOnlyArray<PerformanceEntry>;
+
+export class PerformanceObserverEntryList {
+  _entries: PerformanceEntryList;
+
+  constructor(entries: PerformanceEntryList) {
+    this._entries = entries;
+  }
+
+  getEntries(): PerformanceEntryList {
+    return this._entries;
+  }
+
+  getEntriesByType(type: PerformanceEntryType): PerformanceEntryList {
+    return this._entries.filter(entry => entry.entryType === type);
+  }
+
+  getEntriesByName(
+    name: string,
+    type?: PerformanceEntryType,
+  ): PerformanceEntryList {
+    if (type === undefined) {
+      return this._entries.filter(entry => entry.name === name);
+    } else {
+      return this._entries.filter(
+        entry => entry.name === name && entry.entryType === type,
+      );
+    }
+  }
+}
+
+export type PerformanceObserverCallback = (
+  list: PerformanceObserverEntryList,
+  observer: PerformanceObserver,
+) => void;
+
+export type PerformanceObserverInit =
+  | {
+      entryTypes: Array<PerformanceEntryType>,
+    }
+  | {
+      type: PerformanceEntryType,
+    };
+
+let _observedEntryTypeRefCount: Map<PerformanceEntryType, number> = new Map();
+
+let _observers: Set<PerformanceObserver> = new Set();
+
+let _onPerformanceEntryCallbackIsSet: boolean = false;
+
+function warnNoNativePerformanceObserver() {
+  warnOnce(
+    'missing-native-performance-observer',
+    'Missing native implementation of PerformanceObserver',
+  );
+}
+
+/**
+ * Implementation of the PerformanceObserver interface for RN,
+ * corresponding to the standard in https://www.w3.org/TR/performance-timeline/
+ *
+ * @example
+ * const observer = new PerformanceObserver((list, _observer) => {
+ *   const entries = list.getEntries();
+ *   entries.forEach(entry => {
+ *     reportEvent({
+ *       eventName: entry.name,
+ *       startTime: entry.startTime,
+ *       endTime: entry.startTime + entry.duration,
+ *       processingStart: entry.processingStart,
+ *       processingEnd: entry.processingEnd,
+ *       interactionId: entry.interactionId,
+ *     });
+ *   });
+ * });
+ * observer.observe({ type: "event" });
+ */
+export default class PerformanceObserver {
+  _callback: PerformanceObserverCallback;
+  _entryTypes: $ReadOnlySet<PerformanceEntryType>;
+
+  constructor(callback: PerformanceObserverCallback) {
+    this._callback = callback;
+  }
+
+  observe(options: PerformanceObserverInit) {
+    if (!NativePerformanceObserver) {
+      warnNoNativePerformanceObserver();
+      return;
+    }
+    if (!_onPerformanceEntryCallbackIsSet) {
+      NativePerformanceObserver.setOnPerformanceEntryCallback(
+        onPerformanceEntry,
+      );
+      _onPerformanceEntryCallbackIsSet = true;
+    }
+    if (options.entryTypes) {
+      this._entryTypes = new Set(options.entryTypes);
+    } else {
+      this._entryTypes = new Set([options.type]);
+    }
+    this._entryTypes.forEach(type => {
+      if (!_observedEntryTypeRefCount.has(type)) {
+        NativePerformanceObserver.startReporting(type);
+      }
+      _observedEntryTypeRefCount.set(
+        type,
+        (_observedEntryTypeRefCount.get(type) ?? 0) + 1,
+      );
+    });
+    _observers.add(this);
+  }
+
+  disconnect(): void {
+    if (!NativePerformanceObserver) {
+      warnNoNativePerformanceObserver();
+      return;
+    }
+    this._entryTypes.forEach(type => {
+      const entryTypeRefCount = _observedEntryTypeRefCount.get(type) ?? 0;
+      if (entryTypeRefCount === 1) {
+        _observedEntryTypeRefCount.delete(type);
+        NativePerformanceObserver.stopReporting(type);
+      } else if (entryTypeRefCount !== 0) {
+        _observedEntryTypeRefCount.set(type, entryTypeRefCount - 1);
+      }
+    });
+    _observers.delete(this);
+    if (_observers.size === 0) {
+      NativePerformanceObserver.setOnPerformanceEntryCallback(undefined);
+      _onPerformanceEntryCallbackIsSet = false;
+    }
+  }
+
+  static supportedEntryTypes: $ReadOnlyArray<PerformanceEntryType> =
+    // TODO: add types once they are fully supported
+    Object.freeze([]);
+}
+
+// This is a callback that gets scheduled and periodically called from the native side
+function onPerformanceEntry() {
+  if (!NativePerformanceObserver) {
+    return;
+  }
+  const rawEntries = NativePerformanceObserver.getPendingEntries();
+  const entries = rawEntries.map(rawToPerformanceEntry);
+  _observers.forEach(observer => {
+    const entriesForObserver: PerformanceEntryList = entries.filter(entry =>
+      observer._entryTypes.has(entry.entryType),
+    );
+    observer._callback(
+      new PerformanceObserverEntryList(entriesForObserver),
+      observer,
+    );
+  });
+}

React/Base/RCTVersion.m

@@ -21,10 +21,10 @@ NSDictionary* RCTGetReactNativeVersion(void)
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^(void){
     __rnVersion = @{
-                  RCTVersionMajor: @(1000),
-                  RCTVersionMinor: @(0),
+                  RCTVersionMajor: @(0),
+                  RCTVersionMinor: @(71),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: [NSNull null],
+                  RCTVersionPrerelease: @"rc.3",
                   };
   });
   return __rnVersion;

React/CoreModules/CoreModulesPlugins.mm

@@ -36,7 +36,6 @@ Class RCTCoreModulesClassProvider(const char *name) {
     {"PerfMonitor", RCTPerfMonitorCls},
     {"DevMenu", RCTDevMenuCls},
     {"DevSettings", RCTDevSettingsCls},
-    {"BlobModule", RCTBlobManagerCls},
     {"RedBox", RCTRedBoxCls},
     {"LogBox", RCTLogBoxCls},
     {"WebSocketExecutor", RCTWebSocketExecutorCls},
@@ -44,6 +43,7 @@ Class RCTCoreModulesClassProvider(const char *name) {
     {"DevLoadingView", RCTDevLoadingViewCls},
     {"DevSplitBundleLoader", RCTDevSplitBundleLoaderCls},
     {"EventDispatcher", RCTEventDispatcherCls},
+    {"BlobModule", RCTBlobManagerCls},
   };
 
   auto p = sCoreModuleClassMap->find(name);

React/CxxBridge/JSCExecutorFactory.mm

@@ -7,7 +7,7 @@
 
 #include "JSCExecutorFactory.h"
 
-#import <jsi/JSCRuntime.h>
+#import <jsc/JSCRuntime.h>
 
 #import <memory>
 

ReactAndroid/build.gradle

@@ -144,6 +144,7 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa
                     new Pair(new File(buildDir, "third-party-ndk/boost/boost_1_76_0/").absolutePath, ""),
                     new Pair(new File(buildDir, "third-party-ndk/double-conversion/").absolutePath, ""),
                     new Pair(new File(buildDir, "third-party-ndk/folly/").absolutePath, ""),
+                    new Pair(new File(buildDir, "third-party-ndk/glog/exported/").absolutePath, ""),
                     new Pair("../ReactCommon/butter/", "butter/"),
                     new Pair("../ReactCommon/callinvoker/", ""),
                     new Pair("../ReactCommon/react/bridging/", "react/bridging/"),
@@ -152,6 +153,8 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa
                     new Pair("../ReactCommon/react/nativemodule/core/platform/android/", ""),
                     new Pair("../ReactCommon/react/renderer/componentregistry/", "react/renderer/componentregistry/"),
                     new Pair("../ReactCommon/react/renderer/components/root/", "react/renderer/components/root/"),
+                    new Pair("../ReactCommon/react/renderer/core/", "react/renderer/core/"),
+                    new Pair("../ReactCommon/react/renderer/debug/", "react/renderer/debug/"),
                     new Pair("../ReactCommon/react/renderer/leakchecker/", "react/renderer/leakchecker/"),
                     new Pair("../ReactCommon/react/renderer/mapbuffer/", "react/renderer/mapbuffer/"),
                     new Pair("../ReactCommon/react/renderer/mounting/", "react/renderer/mounting/"),
@@ -159,6 +162,7 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa
                     new Pair("../ReactCommon/react/renderer/scheduler/", "react/renderer/scheduler/"),
                     new Pair("../ReactCommon/react/renderer/telemetry/", "react/renderer/telemetry/"),
                     new Pair("../ReactCommon/react/renderer/uimanager/", "react/renderer/uimanager/"),
+                    new Pair("../ReactCommon/react/debug/", "react/debug/"),
                     new Pair("../ReactCommon/react/utils/", "react/utils/"),
                     new Pair("src/main/jni/react/jni", "react/jni/"),
                 ]
@@ -174,6 +178,35 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa
                 "rrc_image",
                 new Pair("../ReactCommon/react/renderer/components/image/", "react/renderer/components/image/")
             ),
+            // These prefab targets are used by Expo & Reanimated
+            new PrefabPreprocessingEntry(
+                "hermes_executor",
+                // "hermes_executor" is statically linking against "hermes_executor_common"
+                // and "hermes_inspector". Here we expose only the headers that we know are needed.
+                new Pair("../ReactCommon/hermes/inspector/", "hermes/inspector/")
+            ),
+            new PrefabPreprocessingEntry(
+                "jscexecutor",
+                // "jscexecutor" is statically linking against "jscruntime"
+                // Here we expose only the headers that we know are needed.
+                new Pair("../ReactCommon/jsc/", "jsc/")
+            ),
+            new PrefabPreprocessingEntry(
+                "react_render_uimanager",
+                new Pair("../ReactCommon/react/renderer/uimanager/", "react/renderer/uimanager/"),
+            ),
+            new PrefabPreprocessingEntry(
+                "react_render_scheduler",
+                new Pair("../ReactCommon/react/renderer/scheduler/", "react/renderer/scheduler/"),
+            ),
+            new PrefabPreprocessingEntry(
+                "react_render_mounting",
+                new Pair("../ReactCommon/react/renderer/mounting/", "react/renderer/mounting/"),
+            ),
+            new PrefabPreprocessingEntry(
+                "reactnativejni",
+                new Pair("src/main/jni/react/jni", "react/jni/"),
+            ),
         ]
     )
     it.outputDir.set(prefabHeadersDir)
@@ -363,8 +396,8 @@ task installArchives {
 }
 
 android {
-    buildToolsVersion = "31.0.0"
-    compileSdkVersion 31
+    buildToolsVersion = "33.0.0"
+    compileSdkVersion 33
 
     // Used to override the NDK path/version on internal CI or by allowing
     // users to customize the NDK path/version from their root project (e.g. for M1 support)
@@ -377,7 +410,7 @@ android {
 
     defaultConfig {
         minSdkVersion(21)
-        targetSdkVersion(31)
+        targetSdkVersion(33)
         versionCode(1)
         versionName("1.0")
 
@@ -402,12 +435,12 @@ android {
                     "-DANDROID_TOOLCHAIN=clang",
                     "-DANDROID_PLATFORM=android-21"
 
-                targets "reactnativejni",
-                    "jscexecutor",
+                targets "jscexecutor",
                     "jsijniprofiler",
                     "reactnativeblob",
                     "reactperfloggerjni",
                     // prefab targets
+                    "reactnativejni",
                     "react_render_debug",
                     "turbomodulejsijni",
                     "runtimeexecutor",
@@ -426,7 +459,11 @@ android {
                     "yoga",
                     "folly_runtime",
                     "react_nativemodule_core",
-                    "react_render_imagemanager"
+                    "react_render_imagemanager",
+                    "react_render_uimanager",
+                    "react_render_scheduler",
+                    "react_render_mounting",
+                    "hermes_executor"
             }
         }
         ndk {
@@ -434,24 +471,6 @@ android {
         }
     }
 
-    buildTypes {
-        debug {
-            externalNativeBuild {
-                cmake {
-                    targets "hermes-executor-debug"
-                }
-            }
-        }
-
-        release {
-            externalNativeBuild {
-                cmake {
-                    targets "hermes-executor-release"
-                }
-            }
-        }
-    }
-
     externalNativeBuild {
         cmake {
             path "src/main/jni/CMakeLists.txt"
@@ -549,6 +568,21 @@ android {
         react_render_imagemanager {
             headers(new File(prefabHeadersDir, "react_render_imagemanager").absolutePath)
         }
+        react_render_uimanager {
+            headers(new File(prefabHeadersDir, "react_render_uimanager").absolutePath)
+        }
+        react_render_scheduler {
+            headers(new File(prefabHeadersDir, "react_render_scheduler").absolutePath)
+        }
+        react_render_mounting {
+            headers(new File(prefabHeadersDir, "react_render_mounting").absolutePath)
+        }
+        reactnativejni {
+            headers(new File(prefabHeadersDir, "reactnativejni").absolutePath)
+        }
+        hermes_executor {
+            headers(new File(prefabHeadersDir, "hermes_executor").absolutePath)
+        }
     }
 
     publishing {
@@ -616,11 +650,13 @@ apply plugin: "org.jetbrains.kotlin.android"
 apply from: "./publish.gradle"
 
 // We need to override the artifact ID as this project is called `ReactAndroid` but
-// the maven coordinates are on `react-native`.
+// the maven coordinates are on `react-android`.
+// Please note that the original coordinates, `react-native`, have been voided
+// as they caused https://github.com/facebook/react-native/issues/35210
 publishing {
     publications {
         getByName("release") {
-            artifactId 'react-native'
+            artifactId 'react-android'
         }
     }
 }

ReactAndroid/cmake-utils/ReactNative-application.cmake

@@ -106,7 +106,7 @@ if(EXISTS ${PROJECT_BUILD_DIR}/generated/rncli/src/main/jni/Android-rncli.cmake)
         include(${PROJECT_BUILD_DIR}/generated/rncli/src/main/jni/Android-rncli.cmake)
         target_link_libraries(${CMAKE_PROJECT_NAME} ${AUTOLINKED_LIBRARIES})
         foreach(autolinked_library ${AUTOLINKED_LIBRARIES})
-            target_link_libraries(autolinked_library common_flags)
+            target_link_libraries(${autolinked_library} common_flags)
         endforeach()
 endif()
 

ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp

@@ -48,7 +48,14 @@ void registerComponents(
   rncli_registerProviders(registry);
 }
 
-std::shared_ptr<TurboModule> provideModules(
+std::shared_ptr<TurboModule> cxxModuleProvider(
+    const std::string &name,
+    const std::shared_ptr<CallInvoker> &jsInvoker) {
+  // Not implemented yet: provide pure-C++ NativeModules here.
+  return nullptr;
+}
+
+std::shared_ptr<TurboModule> javaModuleProvider(
     const std::string &name,
     const JavaTurboModule::InitParams &params) {
   // Here you can provide your own module provider for TurboModules coming from
@@ -70,8 +77,10 @@ std::shared_ptr<TurboModule> provideModules(
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
   return facebook::jni::initialize(vm, [] {
-    facebook::react::DefaultTurboModuleManagerDelegate::
-        moduleProvidersFromEntryPoint = &facebook::react::provideModules;
+    facebook::react::DefaultTurboModuleManagerDelegate::cxxModuleProvider =
+        &facebook::react::cxxModuleProvider;
+    facebook::react::DefaultTurboModuleManagerDelegate::javaModuleProvider =
+        &facebook::react::javaModuleProvider;
     facebook::react::DefaultComponentsRegistry::
         registerComponentDescriptorsFromEntryPoint =
             &facebook::react::registerComponents;

ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=1000.0.0
+VERSION_NAME=0.71.0-rc.3
 GROUP=com.facebook.react
 
 # JVM Versions

ReactAndroid/hermes-engine/build.gradle

@@ -234,4 +234,17 @@ afterEvaluate {
     prepareHeadersForPrefab.dependsOn(buildHermes)
 }
 
+/* Publishing Configuration */
 apply from: "../publish.gradle"
+
+// We need to override the artifact ID as this project is called `hermes-engine` but
+// the maven coordinates are on `hermes-android`.
+// Please note that the original coordinates, `hermes-engine`, have been voided
+// as they caused https://github.com/facebook/react-native/issues/35210
+publishing {
+    publications {
+        getByName("release") {
+            artifactId 'hermes-android'
+        }
+    }
+}

ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/BUCK

@@ -17,6 +17,7 @@ rn_android_library(
         react_native_target("java/com/facebook/hermes/instrumentation:instrumentation"),
         react_native_target("java/com/facebook/hermes/instrumentation:hermes_samplingprofiler"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
+        react_native_target("java/com/facebook/react/common:common"),
         react_native_target("jni/react/hermes/reactexecutor:jni"),
         ":runtimeconfig",
     ],

ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutor.java

@@ -9,6 +9,7 @@ package com.facebook.hermes.reactexecutor;
 
 import com.facebook.jni.HybridData;
 import com.facebook.react.bridge.JavaScriptExecutor;
+import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.soloader.SoLoader;
 import javax.annotation.Nullable;
 
@@ -23,11 +24,11 @@ public class HermesExecutor extends JavaScriptExecutor {
     if (mode_ == null) {
       // libhermes must be loaded explicitly to invoke its JNI_OnLoad.
       SoLoader.loadLibrary("hermes");
-      try {
-        SoLoader.loadLibrary("hermes-executor-debug");
+      SoLoader.loadLibrary("hermes_executor");
+      // libhermes_executor is built differently for Debug & Release so we load the proper mode.
+      if (ReactBuildConfig.DEBUG == true) {
         mode_ = "Debug";
-      } catch (UnsatisfiedLinkError e) {
-        SoLoader.loadLibrary("hermes-executor-release");
+      } else {
         mode_ = "Release";
       }
     }

ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -15,8 +15,8 @@ import java.util.Map;
 
 public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
-      "major", 1000,
-      "minor", 0,
+      "major", 0,
+      "minor", 71,
       "patch", 0,
-      "prerelease", null);
+      "prerelease", "rc.3");
 }

ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.java

@@ -120,7 +120,9 @@ public class ReactModalHostView extends ViewGroup
 
   @Override
   public int getChildCount() {
-    return mHostView.getChildCount();
+    // This method may be called by the parent constructor
+    // before mHostView is initialized.
+    return mHostView == null ? 0 : mHostView.getChildCount();
   }
 
   @Override

ReactAndroid/src/main/jni/CMakeLists.txt

@@ -56,6 +56,7 @@ add_react_common_subdir(reactperflogger)
 add_react_common_subdir(logger)
 add_react_common_subdir(jsiexecutor)
 add_react_common_subdir(cxxreact)
+add_react_common_subdir(jsc)
 add_react_common_subdir(jsi)
 add_react_common_subdir(butter)
 add_react_common_subdir(callinvoker)

ReactAndroid/src/main/jni/react/hermes/reactexecutor/BUCK

@@ -14,6 +14,6 @@ rn_xplat_cxx_library(
     headers = [],
     header_namespace = "",
     compiler_flags = ["-fexceptions"],
-    soname = "libhermes-executor.$(ext)",
+    soname = "libhermes_executor.$(ext)",
     visibility = ["PUBLIC"],
 )

ReactAndroid/src/main/jni/react/hermes/reactexecutor/CMakeLists.txt

@@ -8,29 +8,20 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 
 file(GLOB_RECURSE hermes_executor_SRC CONFIGURE_DEPENDS *.cpp)
 
-if(${CMAKE_BUILD_TYPE} MATCHES Debug)
-        set(HERMES_TARGET_SUFFIX debug)
-else()
-        set(HERMES_TARGET_SUFFIX release)
-endif()
-
-set(HERMES_TARGET_NAME hermes-executor-${HERMES_TARGET_SUFFIX})
-
-add_library(
-        ${HERMES_TARGET_NAME}
+add_library(hermes_executor
         SHARED
         ${hermes_executor_SRC}
 )
 target_compile_options(
-        ${HERMES_TARGET_NAME}
+        hermes_executor
         PRIVATE
         $<$<CONFIG:Debug>:-DHERMES_ENABLE_DEBUGGER=1>
         -fexceptions
 )
-target_include_directories(${HERMES_TARGET_NAME} PRIVATE .)
+target_include_directories(hermes_executor PRIVATE .)
 target_link_libraries(
-        ${HERMES_TARGET_NAME}
-        hermes-executor-common
+        hermes_executor
+        hermes_executor_common
         jsireact
         fb
         fbjni

ReactAndroid/src/main/jni/react/jscexecutor/BUCK

@@ -16,7 +16,7 @@ rn_xplat_cxx_library(
     deps = [
         FBJNI_TARGET,
         react_native_target("jni/react/jni:jni"),
-        react_native_xplat_target("jsi:JSCRuntime"),
+        react_native_xplat_target("jsc:JSCRuntime"),
         react_native_xplat_target("jsiexecutor:jsiexecutor"),
     ],
 )

ReactAndroid/src/main/jni/react/jscexecutor/OnLoad.cpp

@@ -6,7 +6,7 @@
  */
 
 #include <fbjni/fbjni.h>
-#include <jsi/JSCRuntime.h>
+#include <jsc/JSCRuntime.h>
 #include <jsireact/JSIExecutor.h>
 #include <react/jni/JReactMarker.h>
 #include <react/jni/JSLogging.h>

ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp

@@ -12,10 +12,15 @@
 namespace facebook {
 namespace react {
 
+std::function<std::shared_ptr<TurboModule>(
+    const std::string &,
+    const std::shared_ptr<CallInvoker> &)>
+    DefaultTurboModuleManagerDelegate::cxxModuleProvider{nullptr};
+
 std::function<std::shared_ptr<TurboModule>(
     const std::string &,
     const JavaTurboModule::InitParams &)>
-    DefaultTurboModuleManagerDelegate::moduleProvidersFromEntryPoint{nullptr};
+    DefaultTurboModuleManagerDelegate::javaModuleProvider{nullptr};
 
 jni::local_ref<DefaultTurboModuleManagerDelegate::jhybriddata>
 DefaultTurboModuleManagerDelegate::initHybrid(jni::alias_ref<jhybridobject>) {
@@ -32,17 +37,21 @@ void DefaultTurboModuleManagerDelegate::registerNatives() {
 std::shared_ptr<TurboModule> DefaultTurboModuleManagerDelegate::getTurboModule(
     const std::string &name,
     const std::shared_ptr<CallInvoker> &jsInvoker) {
-  // Not implemented yet: provide pure-C++ NativeModules here.
+  auto moduleProvider = DefaultTurboModuleManagerDelegate::cxxModuleProvider;
+  if (moduleProvider) {
+    return moduleProvider(name, jsInvoker);
+  }
   return nullptr;
 }
 
 std::shared_ptr<TurboModule> DefaultTurboModuleManagerDelegate::getTurboModule(
     const std::string &name,
     const JavaTurboModule::InitParams &params) {
-  auto resolvedModule = (DefaultTurboModuleManagerDelegate::
-                             moduleProvidersFromEntryPoint)(name, params);
-  if (resolvedModule != nullptr) {
-    return resolvedModule;
+  auto moduleProvider = DefaultTurboModuleManagerDelegate::javaModuleProvider;
+  if (moduleProvider) {
+    if (auto resolvedModule = moduleProvider(name, params)) {
+      return resolvedModule;
+    }
   }
   return rncore_ModuleProvider(name, params);
 }

ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h

@@ -27,10 +27,15 @@ class DefaultTurboModuleManagerDelegate : public jni::HybridClass<
 
   static void registerNatives();
 
+  static std::function<std::shared_ptr<TurboModule>(
+      const std::string &,
+      const std::shared_ptr<CallInvoker> &)>
+      cxxModuleProvider;
+
   static std::function<std::shared_ptr<TurboModule>(
       const std::string &,
       const JavaTurboModule::InitParams &)>
-      moduleProvidersFromEntryPoint;
+      javaModuleProvider;
 
   std::shared_ptr<TurboModule> getTurboModule(
       const std::string &name,

ReactCommon/React-Fabric.podspec

@@ -78,7 +78,6 @@ Pod::Spec.new do |s|
 
   s.subspec "core" do |ss|
     ss.dependency             folly_dep_name, folly_version
-    ss.dependency             "React-jsidynamic", version
     ss.compiler_flags       = folly_compiler_flags + ' ' + boost_compiler_flags
     ss.source_files         = "react/renderer/core/**/*.{m,mm,cpp,h}"
     ss.exclude_files        = "react/renderer/core/tests"
@@ -303,7 +302,6 @@ Pod::Spec.new do |s|
 
   s.subspec "uimanager" do |ss|
     ss.dependency             folly_dep_name, folly_version
-    ss.dependency             "React-jsidynamic", version
     ss.compiler_flags       = folly_compiler_flags
     ss.source_files         = "react/renderer/uimanager/**/*.{m,mm,cpp,h}"
     ss.exclude_files        = "react/renderer/uimanager/tests"

ReactCommon/React-bridging.podspec

@@ -1,43 +0,0 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
-require "json"
-
-package = JSON.parse(File.read(File.join(__dir__, "..", "package.json")))
-version = package['version']
-
-source = { :git => 'https://github.com/facebook/react-native.git' }
-if version == '1000.0.0'
-  # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
-else
-  source[:tag] = "v#{version}"
-end
-
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -Wno-gnu-zero-variadic-macro-arguments'
-folly_version = '2021.07.22.00'
-
-Pod::Spec.new do |s|
-  s.name                   = "React-bridging"
-  s.version                = version
-  s.summary                = "-"  # TODO
-  s.homepage               = "https://reactnative.dev/"
-  s.license                = package["license"]
-  s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "12.4" }
-  s.source                 = source
-  s.source_files           = "react/bridging/**/*.{cpp,h}"
-  s.exclude_files          = "react/bridging/tests"
-  s.header_dir             = "react/bridging"
-  s.header_mappings_dir    = "."
-  s.compiler_flags         = folly_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\"",
-                               "USE_HEADERMAP" => "YES",
-                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
-                               "GCC_WARN_PEDANTIC" => "YES" }
-
-  s.dependency "RCT-Folly", folly_version
-  s.dependency "React-jsi", version
-end

ReactCommon/ReactCommon.podspec

@@ -32,7 +32,7 @@ Pod::Spec.new do |s|
   s.source                 = source
   s.header_dir             = "ReactCommon" # Use global header_dir for all subspecs for use_frameworks! compatibility
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" \"$(PODS_ROOT)/Headers/Private/React-bridging/react/bridging\" \"$(PODS_CONFIGURATION_BUILD_DIR)/React-bridging/react_bridging.framework/Headers\"",
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\"",
                                "USE_HEADERMAP" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
                                "GCC_WARN_PEDANTIC" => "YES" }
@@ -40,7 +40,6 @@ Pod::Spec.new do |s|
   # TODO (T48588859): Restructure this target to align with dir structure: "react/nativemodule/..."
   # Note: Update this only when ready to minimize breaking changes.
   s.subspec "turbomodule" do |ss|
-    ss.dependency "React-bridging", version
     ss.dependency "React-callinvoker", version
     ss.dependency "React-perflogger", version
     ss.dependency "React-Core", version
@@ -51,10 +50,18 @@ Pod::Spec.new do |s|
     ss.dependency "DoubleConversion"
     ss.dependency "glog"
 
+    ss.subspec "bridging" do |sss|
+      sss.dependency           "React-jsi", version
+      sss.source_files         = "react/bridging/**/*.{cpp,h}"
+      sss.exclude_files        = "react/bridging/tests"
+      sss.header_dir           = "react/bridging"
+      sss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/RCT-Folly\"" }
+    end
+
     ss.subspec "core" do |sss|
       sss.source_files = "react/nativemodule/core/ReactCommon/**/*.{cpp,h}",
                          "react/nativemodule/core/platform/ios/**/*.{mm,cpp,h}"
-      sss.dependency "React-jsidynamic", version
+      sss.exclude_files = "react/nativemodule/core/ReactCommon/{LongLivedObject,CallbackWrapper}.h"
     end
 
     s.subspec "react_debug_core" do |sss|

ReactCommon/cxxreact/ReactNativeVersion.h

@@ -15,10 +15,10 @@
 namespace facebook::react {
 
 constexpr struct {
-  int32_t Major = 1000;
-  int32_t Minor = 0;
+  int32_t Major = 0;
+  int32_t Minor = 71;
   int32_t Patch = 0;
-  std::string_view Prerelease = "";
+  std::string_view Prerelease = "rc.3";
 } ReactNativeVersion;
 
 } // namespace facebook::react

ReactCommon/hermes/React-hermes.podspec

@@ -44,7 +44,6 @@ Pod::Spec.new do |s|
                              }.merge!(build_type == :debug ? { "GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1" } : {})
   s.header_dir             = "reacthermes"
   s.dependency "React-cxxreact", version
-  s.dependency "React-jsidynamic", version
   s.dependency "React-jsiexecutor", version
   s.dependency "React-jsinspector", version
   s.dependency "React-perflogger", version

ReactCommon/hermes/executor/CMakeLists.txt

@@ -8,21 +8,22 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 
 file(GLOB_RECURSE hermes_executor_SRC CONFIGURE_DEPENDS *.cpp)
 add_library(
-        hermes-executor-common
+        hermes_executor_common
         STATIC
         ${hermes_executor_SRC}
 )
-target_include_directories(hermes-executor-common PUBLIC .)
-target_link_libraries(hermes-executor-common
+target_include_directories(hermes_executor_common PUBLIC .)
+target_link_libraries(hermes_executor_common
         jsireact
         hermes-engine::libhermes
         jsi
-        debug hermes-inspector
+        debug
+        hermes_inspector
 )
 
 if(${CMAKE_BUILD_TYPE} MATCHES Debug)
         target_compile_options(
-                hermes-executor-common
+                hermes_executor_common
                 PRIVATE
                 -DHERMES_ENABLE_DEBUGGER=1
         )

ReactCommon/hermes/inspector/CMakeLists.txt

@@ -8,20 +8,20 @@ set(CMAKE_VERBOSE_MAKEFILE on)
 
 file(GLOB hermesinspector_SRC CONFIGURE_DEPENDS *.cpp detail/*.cpp chrome/*.cpp)
 
-add_library(hermes-inspector
+add_library(hermes_inspector
         STATIC
         ${hermesinspector_SRC})
 
 target_compile_options(
-        hermes-inspector
+        hermes_inspector
         PRIVATE
         -DHERMES_ENABLE_DEBUGGER=1
         -DHERMES_INSPECTOR_FOLLY_KLUDGE=1
         -fexceptions
 )
 
-target_include_directories(hermes-inspector PUBLIC ${REACT_COMMON_DIR})
-target_link_libraries(hermes-inspector
+target_include_directories(hermes_inspector PUBLIC ${REACT_COMMON_DIR})
+target_link_libraries(hermes_inspector
         jsinspector
         fb
         fbjni

ReactCommon/jsc/.clang-tidy

@@ -0,0 +1,6 @@
+---
+Checks: '>
+clang-diagnostic-*,
+'
+InheritParentConfig: true
+...

ReactCommon/jsc/BUCK

@@ -0,0 +1,34 @@
+load("//tools/build_defs/oss:rn_defs.bzl", "APPLE", "IOS", "MACOSX", "get_apple_compiler_flags", "get_apple_inspector_flags", "get_preprocessor_flags_for_build_mode", "react_native_xplat_dep", "rn_xplat_cxx_library")
+
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
+
+rn_xplat_cxx_library(
+    name = "JSCRuntime",
+    srcs = [
+        "JSCRuntime.cpp",
+    ],
+    header_namespace = "jsc",
+    exported_headers = [
+        "JSCRuntime.h",
+    ],
+    apple_sdks = (IOS, MACOSX),
+    compiler_flags_pedantic = True,
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS + [
+        "-Os",
+    ],
+    fbobjc_frameworks = [
+        "$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework",
+    ],
+    fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+    ],
+    platforms = APPLE,
+    visibility = ["PUBLIC"],
+    xplat_mangled_args = {
+        "soname": "libjscjsi.$(ext)",
+    },
+    exported_deps = [
+        react_native_xplat_dep("jsi:jsi"),
+    ],
+)

ReactCommon/jsc/CMakeLists.txt

@@ -0,0 +1,35 @@
+# 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.
+
+##################
+### jscruntime ###
+##################
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(
+        -fexceptions
+        -frtti
+        -O3
+        -Wno-unused-lambda-capture
+        -DLOG_TAG=\"ReactNative\")
+
+add_library(jscruntime
+        STATIC
+        JSCRuntime.h
+        JSCRuntime.cpp)
+
+target_include_directories(jscruntime PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(jscruntime
+        folly_runtime
+        jsc
+        jsi
+        glog)
+
+# TODO: Remove this flag when ready.
+# Android has this enabled by default, but the flag is still needed for iOS.
+target_compile_options(jscruntime PRIVATE -DRN_FABRIC_ENABLED)

ReactCommon/jsc/React-jsc.podspec

@@ -28,12 +28,8 @@ Pod::Spec.new do |s|
   s.source_files           = "JSCRuntime.{cpp,h}"
   s.exclude_files          = "**/test/*"
   s.framework              = "JavaScriptCore"
-  s.dependency "React-jsi", version
-  s.default_subspec        = "Default"
 
-  s.subspec "Default" do
-    # no-op
-  end
+  s.dependency "React-jsi", version
 
   s.subspec "Fabric" do |ss|
     ss.pod_target_xcconfig  = { "OTHER_CFLAGS" => "$(inherited) -DRN_FABRIC_ENABLED" }

ReactCommon/jsi/BUCK

@@ -1,4 +1,4 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "APPLE", "IOS", "MACOSX", "react_native_xplat_dep", "rn_xplat_cxx_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_xplat_dep", "rn_xplat_cxx_library")
 
 rn_xplat_cxx_library(
     name = "jsi",
@@ -56,33 +56,3 @@ rn_xplat_cxx_library(
         react_native_xplat_dep("jsi:jsi"),
     ],
 )
-
-rn_xplat_cxx_library(
-    name = "JSCRuntime",
-    srcs = [
-        "JSCRuntime.cpp",
-    ],
-    header_namespace = "jsi",
-    exported_headers = [
-        "JSCRuntime.h",
-    ],
-    apple_sdks = (IOS, MACOSX),
-    compiler_flags_pedantic = True,
-    fbobjc_compiler_flags = [
-        "-Os",
-    ],
-    fbobjc_frameworks = [
-        "$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework",
-    ],
-    labels = [
-        "pfh:ReactNative_CommonInfrastructurePlaceholder",
-    ],
-    platforms = APPLE,
-    visibility = ["PUBLIC"],
-    xplat_mangled_args = {
-        "soname": "libjscjsi.$(ext)",
-    },
-    exported_deps = [
-        react_native_xplat_dep("jsi:jsi"),
-    ],
-)

ReactCommon/jsi/CMakeLists.txt

@@ -25,19 +25,3 @@ target_include_directories(jsi PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(jsi
         folly_runtime
         glog)
-
-##################
-### jscruntime ###
-##################
-
-add_library(jscruntime STATIC
-        JSCRuntime.h
-        JSCRuntime.cpp)
-
-target_include_directories(jscruntime PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
-target_link_libraries(jscruntime folly_runtime jsc glog)
-
-# TODO: Remove this flag when ready.
-# Android has this enabled by default, but the flag is still needed for iOS.
-target_compile_options(jscruntime PRIVATE -DRN_FABRIC_ENABLED)

ReactCommon/jsi/React-jsi.podspec

@@ -20,6 +20,10 @@ else
   source[:tag] = "v#{version}"
 end
 
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+folly_version = '2021.07.22.00'
+boost_compiler_flags = '-Wno-documentation'
+
 Pod::Spec.new do |s|
   s.name                   = "React-jsi"
   s.version                = version
@@ -30,18 +34,27 @@ Pod::Spec.new do |s|
   s.platforms              = { :ios => "12.4" }
   s.source                 = source
 
+  s.header_dir    = "jsi"
+  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
+
+  s.dependency "boost", "1.76.0"
+  s.dependency "DoubleConversion"
+  s.dependency "RCT-Folly", folly_version
+  s.dependency "glog"
+
   if js_engine == :jsc
     s.source_files  = "**/*.{cpp,h}"
     s.exclude_files = [
-                        "jsi/JSIDynamic.{h,cpp}",
                         "jsi/jsilib-posix.cpp",
                         "jsi/jsilib-windows.cpp",
                         "**/test/*"
                       ]
-    s.header_dir    = "jsi"
+
   elsif js_engine == :hermes
     # JSI is provided by hermes-engine when Hermes is enabled
-    s.source_files = ""
+    # Just need to provide JSIDynamic in this case.
+    s.source_files = "jsi/JSIDynamic.{cpp,h}"
     s.dependency "hermes-engine"
   end
 end

ReactCommon/jsi/React-jsidynamic.podspec

@@ -1,42 +0,0 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
-require "json"
-
-package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
-version = package['version']
-
-source = { :git => 'https://github.com/facebook/react-native.git' }
-if version == '1000.0.0'
-  # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in.
-  source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1")
-else
-  source[:tag] = "v#{version}"
-end
-
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.07.22.00'
-boost_compiler_flags = '-Wno-documentation'
-
-Pod::Spec.new do |s|
-  s.name                   = "React-jsidynamic"
-  s.version                = version
-  s.summary                = "Provides support for converting between folly::dynamic and jsi::value"
-  s.homepage               = "https://reactnative.dev/"
-  s.license                = package["license"]
-  s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "12.4" }
-  s.source                 = source
-  s.source_files           = "jsi/JSIDynamic.{cpp,h}"
-  s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\"" }
-  s.header_dir             = 'jsi'
-
-  s.dependency "boost", "1.76.0"
-  s.dependency "DoubleConversion"
-  s.dependency "RCT-Folly", folly_version
-  s.dependency "glog"
-  s.dependency "React-jsi", version
-end

ReactCommon/jsiexecutor/React-jsiexecutor.podspec

@@ -36,7 +36,6 @@ Pod::Spec.new do |s|
 
   s.dependency "React-cxxreact", version
   s.dependency "React-jsi", version
-  s.dependency "React-jsidynamic", version
   s.dependency "React-perflogger", version
   s.dependency "RCT-Folly", folly_version
   s.dependency "DoubleConversion"

ReactCommon/react/bridging/CallbackWrapper.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <jsi/jsi.h>
-#include <react/bridging/LongLivedObject.h>
+#include "LongLivedObject.h"
 
 #include <memory>
 

ReactCommon/react/nativemodule/core/ReactCommon/CallbackWrapper.h

@@ -0,0 +1,11 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+// This header is left here for compatibility reasons.
+#include <react/bridging/CallbackWrapper.h>

ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h

@@ -13,8 +13,7 @@
 #include <jsi/jsi.h>
 
 #include <ReactCommon/CallInvoker.h>
-#include <react/bridging/CallbackWrapper.h>
-#include <react/bridging/LongLivedObject.h>
+#include <ReactCommon/CallbackWrapper.h>
 
 namespace facebook {
 namespace react {

ReactCommon/react/renderer/attributedstring/TextAttributes.cpp

@@ -46,6 +46,9 @@ void TextAttributes::apply(TextAttributes textAttributes) {
   allowFontScaling = textAttributes.allowFontScaling.has_value()
       ? textAttributes.allowFontScaling
       : allowFontScaling;
+  dynamicTypeRamp = textAttributes.dynamicTypeRamp.has_value()
+      ? textAttributes.dynamicTypeRamp
+      : dynamicTypeRamp;
   letterSpacing = !std::isnan(textAttributes.letterSpacing)
       ? textAttributes.letterSpacing
       : letterSpacing;
@@ -111,6 +114,7 @@ bool TextAttributes::operator==(const TextAttributes &rhs) const {
              fontStyle,
              fontVariant,
              allowFontScaling,
+             dynamicTypeRamp,
              alignment,
              baseWritingDirection,
              lineBreakStrategy,
@@ -131,6 +135,7 @@ bool TextAttributes::operator==(const TextAttributes &rhs) const {
              rhs.fontStyle,
              rhs.fontVariant,
              rhs.allowFontScaling,
+             rhs.dynamicTypeRamp,
              rhs.alignment,
              rhs.baseWritingDirection,
              rhs.lineBreakStrategy,
@@ -186,6 +191,7 @@ SharedDebugStringConvertibleList TextAttributes::getDebugProps() const {
       debugStringConvertibleItem("fontStyle", fontStyle),
       debugStringConvertibleItem("fontVariant", fontVariant),
       debugStringConvertibleItem("allowFontScaling", allowFontScaling),
+      debugStringConvertibleItem("dynamicTypeRamp", dynamicTypeRamp),
       debugStringConvertibleItem("letterSpacing", letterSpacing),
 
       // Paragraph Styles

ReactCommon/react/renderer/attributedstring/TextAttributes.h

@@ -50,6 +50,7 @@ class TextAttributes : public DebugStringConvertible {
   std::optional<FontStyle> fontStyle{};
   std::optional<FontVariant> fontVariant{};
   std::optional<bool> allowFontScaling{};
+  std::optional<DynamicTypeRamp> dynamicTypeRamp{};
   Float letterSpacing{std::numeric_limits<Float>::quiet_NaN()};
   std::optional<TextTransform> textTransform{};
 

ReactCommon/react/renderer/attributedstring/conversions.h

@@ -34,6 +34,84 @@
 namespace facebook {
 namespace react {
 
+inline std::string toString(const DynamicTypeRamp &dynamicTypeRamp) {
+  switch (dynamicTypeRamp) {
+    case DynamicTypeRamp::Caption2:
+      return "caption2";
+    case DynamicTypeRamp::Caption1:
+      return "caption1";
+    case DynamicTypeRamp::Footnote:
+      return "footnote";
+    case DynamicTypeRamp::Subheadline:
+      return "subheadline";
+    case DynamicTypeRamp::Callout:
+      return "callout";
+    case DynamicTypeRamp::Body:
+      return "body";
+    case DynamicTypeRamp::Headline:
+      return "headline";
+    case DynamicTypeRamp::Title3:
+      return "title3";
+    case DynamicTypeRamp::Title2:
+      return "title2";
+    case DynamicTypeRamp::Title1:
+      return "title1";
+    case DynamicTypeRamp::LargeTitle:
+      return "largeTitle";
+  }
+
+  LOG(ERROR) << "Unsupported DynamicTypeRamp value";
+  react_native_assert(false);
+
+  // Sane default in case of parsing errors
+  return "body";
+}
+
+inline void fromRawValue(
+    const PropsParserContext &context,
+    const RawValue &value,
+    DynamicTypeRamp &result) {
+  react_native_assert(value.hasType<std::string>());
+  if (value.hasType<std::string>()) {
+    auto string = (std::string)value;
+    if (string == "caption2") {
+      result = DynamicTypeRamp::Caption2;
+    } else if (string == "caption1") {
+      result = DynamicTypeRamp::Caption1;
+    } else if (string == "footnote") {
+      result = DynamicTypeRamp::Footnote;
+    } else if (string == "subheadline") {
+      result = DynamicTypeRamp::Subheadline;
+    } else if (string == "callout") {
+      result = DynamicTypeRamp::Callout;
+    } else if (string == "body") {
+      result = DynamicTypeRamp::Body;
+    } else if (string == "headline") {
+      result = DynamicTypeRamp::Headline;
+    } else if (string == "title3") {
+      result = DynamicTypeRamp::Title3;
+    } else if (string == "title2") {
+      result = DynamicTypeRamp::Title2;
+    } else if (string == "title1") {
+      result = DynamicTypeRamp::Title1;
+    } else if (string == "largeTitle") {
+      result = DynamicTypeRamp::LargeTitle;
+    } else {
+      // sane default
+      LOG(ERROR) << "Unsupported DynamicTypeRamp value: " << string;
+      react_native_assert(false);
+      result = DynamicTypeRamp::Body;
+    }
+    return;
+  }
+
+  LOG(ERROR) << "Unsupported DynamicTypeRamp type";
+  react_native_assert(false);
+
+  // Sane default in case of parsing errors
+  result = DynamicTypeRamp::Body;
+}
+
 inline std::string toString(const EllipsizeMode &ellipsisMode) {
   switch (ellipsisMode) {
     case EllipsizeMode::Clip:

ReactCommon/react/renderer/attributedstring/primitives.h

@@ -46,6 +46,20 @@ enum class FontVariant : int {
   ProportionalNums = 1 << 5
 };
 
+enum class DynamicTypeRamp {
+  Caption2,
+  Caption1,
+  Footnote,
+  Subheadline,
+  Callout,
+  Body,
+  Headline,
+  Title3,
+  Title2,
+  Title1,
+  LargeTitle
+};
+
 enum class EllipsizeMode {
   Clip, // Do not add ellipsize, simply clip.
   Head, // Truncate at head of line: "...wxyz".
@@ -190,6 +204,13 @@ struct hash<facebook::react::FontWeight> {
   }
 };
 
+template <>
+struct hash<facebook::react::DynamicTypeRamp> {
+  size_t operator()(const facebook::react::DynamicTypeRamp &v) const {
+    return hash<int>()(static_cast<int>(v));
+  }
+};
+
 template <>
 struct hash<facebook::react::EllipsizeMode> {
   size_t operator()(const facebook::react::EllipsizeMode &v) const {

ReactCommon/react/renderer/components/text/BaseTextProps.cpp

@@ -73,6 +73,12 @@ static TextAttributes convertRawProp(
       "allowFontScaling",
       sourceTextAttributes.allowFontScaling,
       defaultTextAttributes.allowFontScaling);
+  textAttributes.dynamicTypeRamp = convertRawProp(
+      context,
+      rawProps,
+      "dynamicTypeRamp",
+      sourceTextAttributes.dynamicTypeRamp,
+      defaultTextAttributes.dynamicTypeRamp);
   textAttributes.letterSpacing = convertRawProp(
       context,
       rawProps,

ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h

@@ -94,6 +94,7 @@ inline bool areTextAttributesEquivalentLayoutWise(
              lhs.fontStyle,
              lhs.fontVariant,
              lhs.allowFontScaling,
+             lhs.dynamicTypeRamp,
              lhs.alignment) ==
       std::tie(
              rhs.fontFamily,
@@ -101,6 +102,7 @@ inline bool areTextAttributesEquivalentLayoutWise(
              rhs.fontStyle,
              rhs.fontVariant,
              rhs.allowFontScaling,
+             rhs.dynamicTypeRamp,
              rhs.alignment) &&
       floatEquality(lhs.fontSize, rhs.fontSize) &&
       floatEquality(lhs.fontSizeMultiplier, rhs.fontSizeMultiplier) &&
@@ -121,6 +123,7 @@ inline size_t textAttributesHashLayoutWise(
       textAttributes.fontStyle,
       textAttributes.fontVariant,
       textAttributes.allowFontScaling,
+      textAttributes.dynamicTypeRamp,
       textAttributes.letterSpacing,
       textAttributes.lineHeight,
       textAttributes.alignment);

ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm

@@ -55,6 +55,83 @@ inline static UIFontWeight RCTUIFontWeightFromInteger(NSInteger fontWeight)
   return weights[(fontWeight + 50) / 100 - 1];
 }
 
+inline static UIFontTextStyle RCTUIFontTextStyleForDynamicTypeRamp(const DynamicTypeRamp &dynamicTypeRamp)
+{
+  switch (dynamicTypeRamp) {
+    case DynamicTypeRamp::Caption2:
+      return UIFontTextStyleCaption2;
+    case DynamicTypeRamp::Caption1:
+      return UIFontTextStyleCaption1;
+    case DynamicTypeRamp::Footnote:
+      return UIFontTextStyleFootnote;
+    case DynamicTypeRamp::Subheadline:
+      return UIFontTextStyleSubheadline;
+    case DynamicTypeRamp::Callout:
+      return UIFontTextStyleCallout;
+    case DynamicTypeRamp::Body:
+      return UIFontTextStyleBody;
+    case DynamicTypeRamp::Headline:
+      return UIFontTextStyleHeadline;
+    case DynamicTypeRamp::Title3:
+      return UIFontTextStyleTitle3;
+    case DynamicTypeRamp::Title2:
+      return UIFontTextStyleTitle2;
+    case DynamicTypeRamp::Title1:
+      return UIFontTextStyleTitle1;
+    case DynamicTypeRamp::LargeTitle:
+      return UIFontTextStyleLargeTitle;
+  }
+}
+
+inline static CGFloat RCTBaseSizeForDynamicTypeRamp(const DynamicTypeRamp &dynamicTypeRamp)
+{
+  // Values taken from
+  // https://developer.apple.com/design/human-interface-guidelines/foundations/typography/#specifications
+  switch (dynamicTypeRamp) {
+    case DynamicTypeRamp::Caption2:
+      return 11.0;
+    case DynamicTypeRamp::Caption1:
+      return 12.0;
+    case facebook::react::DynamicTypeRamp::Footnote:
+      return 13.0;
+    case facebook::react::DynamicTypeRamp::Subheadline:
+      return 15.0;
+    case facebook::react::DynamicTypeRamp::Callout:
+      return 16.0;
+    case facebook::react::DynamicTypeRamp::Body:
+      return 17.0;
+    case facebook::react::DynamicTypeRamp::Headline:
+      return 17.0;
+    case facebook::react::DynamicTypeRamp::Title3:
+      return 20.0;
+    case facebook::react::DynamicTypeRamp::Title2:
+      return 22.0;
+    case facebook::react::DynamicTypeRamp::Title1:
+      return 28.0;
+    case facebook::react::DynamicTypeRamp::LargeTitle:
+      return 34.0;
+  }
+}
+
+inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const TextAttributes &textAttributes)
+{
+  if (textAttributes.allowFontScaling.value_or(true)) {
+    if (textAttributes.dynamicTypeRamp.has_value()) {
+      DynamicTypeRamp dynamicTypeRamp = textAttributes.dynamicTypeRamp.value();
+      UIFontMetrics *fontMetrics =
+          [UIFontMetrics metricsForTextStyle:RCTUIFontTextStyleForDynamicTypeRamp(dynamicTypeRamp)];
+      // Using a specific font size reduces rounding errors from -scaledValueForValue:
+      CGFloat requestedSize =
+          isnan(textAttributes.fontSize) ? RCTBaseSizeForDynamicTypeRamp(dynamicTypeRamp) : textAttributes.fontSize;
+      return [fontMetrics scaledValueForValue:requestedSize] / requestedSize;
+    } else {
+      return textAttributes.fontSizeMultiplier;
+    }
+  } else {
+    return 1.0;
+  }
+}
+
 inline static UIFont *RCTEffectiveFontFromTextAttributes(const TextAttributes &textAttributes)
 {
   NSString *fontFamily = [NSString stringWithCString:textAttributes.fontFamily.c_str() encoding:NSUTF8StringEncoding];
@@ -71,19 +148,11 @@ inline static UIFont *RCTEffectiveFontFromTextAttributes(const TextAttributes &t
   fontProperties.weight = textAttributes.fontWeight.has_value()
       ? RCTUIFontWeightFromInteger((NSInteger)textAttributes.fontWeight.value())
       : NAN;
-  fontProperties.sizeMultiplier =
-      textAttributes.allowFontScaling.value_or(true) ? textAttributes.fontSizeMultiplier : 1;
+  fontProperties.sizeMultiplier = RCTEffectiveFontSizeMultiplierFromTextAttributes(textAttributes);
 
   return RCTFontWithFontProperties(fontProperties);
 }
 
-inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const TextAttributes &textAttributes)
-{
-  return textAttributes.allowFontScaling.value_or(true) && !isnan(textAttributes.fontSizeMultiplier)
-      ? textAttributes.fontSizeMultiplier
-      : 1.0;
-}
-
 inline static UIColor *RCTEffectiveForegroundColorFromTextAttributes(const TextAttributes &textAttributes)
 {
   UIColor *effectiveForegroundColor = RCTUIColorFromSharedColor(textAttributes.foregroundColor) ?: [UIColor blackColor];

ReactCommon/yoga/yoga/Yoga.cpp

@@ -2079,7 +2079,7 @@ static float YGDistributeFreeSpaceSecondPass(
     const float availableInnerCrossDim,
     const float availableInnerWidth,
     const float availableInnerHeight,
-    const bool flexBasisOverflows,
+    const bool mainAxisOverflows,
     const YGMeasureMode measureModeCrossDim,
     const bool performLayout,
     const YGConfigRef config,
@@ -2175,7 +2175,7 @@ static float YGDistributeFreeSpaceSecondPass(
         !YGNodeIsStyleDimDefined(
             currentRelativeChild, crossAxis, availableInnerCrossDim) &&
         measureModeCrossDim == YGMeasureModeExactly &&
-        !(isNodeFlexWrap && flexBasisOverflows) &&
+        !(isNodeFlexWrap && mainAxisOverflows) &&
         YGNodeAlignItem(node, currentRelativeChild) == YGAlignStretch &&
         currentRelativeChild->marginLeadingValue(crossAxis).unit !=
             YGUnitAuto &&
@@ -2383,7 +2383,7 @@ static void YGResolveFlexibleLength(
     const float availableInnerCrossDim,
     const float availableInnerWidth,
     const float availableInnerHeight,
-    const bool flexBasisOverflows,
+    const bool mainAxisOverflows,
     const YGMeasureMode measureModeCrossDim,
     const bool performLayout,
     const YGConfigRef config,
@@ -2411,7 +2411,7 @@ static void YGResolveFlexibleLength(
       availableInnerCrossDim,
       availableInnerWidth,
       availableInnerHeight,
-      flexBasisOverflows,
+      mainAxisOverflows,
       measureModeCrossDim,
       performLayout,
       config,
@@ -2884,7 +2884,9 @@ static void YGNodelayoutImpl(
 
   // STEP 3: DETERMINE FLEX BASIS FOR EACH ITEM
 
-  float totalOuterFlexBasis = YGNodeComputeFlexBasisForChildren(
+  // Computed basis + margins + gap
+  float totalMainDim = 0;
+  totalMainDim += YGNodeComputeFlexBasisForChildren(
       node,
       availableInnerWidth,
       availableInnerHeight,
@@ -2899,10 +2901,17 @@ static void YGNodelayoutImpl(
       depth,
       generationCount);
 
-  const bool flexBasisOverflows = measureModeMainDim == YGMeasureModeUndefined
-      ? false
-      : totalOuterFlexBasis > availableInnerMainDim;
-  if (isNodeFlexWrap && flexBasisOverflows &&
+  if (childCount > 1) {
+    totalMainDim +=
+        node->getGapForAxis(mainAxis, availableInnerCrossDim).unwrap() *
+        (childCount - 1);
+  }
+
+  const bool mainAxisOverflows =
+      (measureModeMainDim != YGMeasureModeUndefined) &&
+      totalMainDim > availableInnerMainDim;
+
+  if (isNodeFlexWrap && mainAxisOverflows &&
       measureModeMainDim == YGMeasureModeAtMost) {
     measureModeMainDim = YGMeasureModeExactly;
   }
@@ -3025,7 +3034,7 @@ static void YGNodelayoutImpl(
           availableInnerCrossDim,
           availableInnerWidth,
           availableInnerHeight,
-          flexBasisOverflows,
+          mainAxisOverflows,
           measureModeCrossDim,
           performLayout,
           config,

android/README.md

@@ -0,0 +1,21 @@
+# The `/android` folder inside `react-native`
+
+Starting from React Native 0.71, we're not shipping the `/android` folder inside the React Native NPM package
+anymore due to sizing constraints on NPM. The Android artifacts are distributed via Maven Central.
+You can read more about it in this RFC:
+https://github.com/react-native-community/discussions-and-proposals/pull/508
+
+If you're a library author and you're manipulating the React Native .aar files, to extract headers,
+extract `.so` files or do anything with it, you're probably doing something wrong. React Native
+0.71 ships with all the necessary logic to let you consume it transparently by just using:
+
+```
+implementation("com.facebook.react:react-android")
+// or to keep backward compatibility with older versions of React Native:
+implementation("com.facebook.react:react-native:+")
+```
+
+You should consider refactoring your library code not to unzip/manipulate the React Native .aar files.
+
+This README.md file is kept in this folder as some libraries are checking the existence of the `/android` folder
+and failing user builds if the folder is missing.

index.js

@@ -59,7 +59,6 @@ import typeof Dimensions from './Libraries/Utilities/Dimensions';
 import typeof Easing from './Libraries/Animated/Easing';
 import typeof ReactNative from './Libraries/Renderer/shims/ReactNative';
 import typeof I18nManager from './Libraries/ReactNative/I18nManager';
-import typeof ImagePickerIOS from './Libraries/Image/ImagePickerIOS';
 import typeof InteractionManager from './Libraries/Interaction/InteractionManager';
 import typeof Keyboard from './Libraries/Components/Keyboard/Keyboard';
 import typeof LayoutAnimation from './Libraries/LayoutAnimation/LayoutAnimation';
@@ -281,16 +280,6 @@ module.exports = {
   get I18nManager(): I18nManager {
     return require('./Libraries/ReactNative/I18nManager');
   },
-  get ImagePickerIOS(): ImagePickerIOS {
-    warnOnce(
-      'imagePickerIOS-moved',
-      'ImagePickerIOS has been extracted from react-native core and will be removed in a future release. ' +
-        "Please upgrade to use either '@react-native-community/react-native-image-picker' or 'expo-image-picker'. " +
-        "If you cannot upgrade to a different library, please install the deprecated '@react-native-community/image-picker-ios' package. " +
-        'See https://github.com/rnc-archive/react-native-image-picker-ios',
-    );
-    return require('./Libraries/Image/ImagePickerIOS');
-  },
   get InteractionManager(): InteractionManager {
     return require('./Libraries/Interaction/InteractionManager');
   },
@@ -765,4 +754,20 @@ if (__DEV__) {
       );
     },
   });
+  /* $FlowFixMe[prop-missing] This is intentional: Flow will error when
+   * attempting to access ImagePickerIOS. */
+  /* $FlowFixMe[invalid-export] This is intentional: Flow will error when
+   * attempting to access ImagePickerIOS. */
+  Object.defineProperty(module.exports, 'ImagePickerIOS', {
+    configurable: true,
+    get() {
+      invariant(
+        false,
+        'ImagePickerIOS has been removed from React Native. ' +
+          "Please upgrade to use either '@react-native-community/react-native-image-picker' or 'expo-image-picker'. " +
+          "If you cannot upgrade to a different library, please install the deprecated '@react-native-community/image-picker-ios' package. " +
+          'See https://github.com/rnc-archive/react-native-image-picker-ios',
+      );
+    },
+  });
 }

jest/react-native-env.js

@@ -12,5 +12,7 @@
 const NodeEnv = require('jest-environment-node').TestEnvironment;
 
 module.exports = class ReactNativeEnv extends NodeEnv {
-  // this is where we'll add our custom logic
+  exportConditions() {
+    return ['react-native'];
+  }
 };

package.json

@@ -1,7 +1,6 @@
 {
   "name": "react-native",
-  "private": true,
-  "version": "1000.0.0",
+  "version": "0.71.0-rc.3",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",
@@ -86,7 +85,7 @@
     "prettier": "prettier --write \"./**/*.{js,md,yml,ts,tsx}\"",
     "format-check": "prettier --list-different \"./**/*.{js,md,yml,ts,tsx}\"",
     "update-lock": "npx yarn-deduplicate",
-    "docker-setup-android": "docker pull reactnativecommunity/react-native-android:6.0",
+    "docker-setup-android": "docker pull reactnativecommunity/react-native-android:6.1",
     "docker-build-android": "docker build -t reactnativeci/android -f .circleci/Dockerfiles/Dockerfile.android .",
     "test-android-run-instrumentation": "docker run --cap-add=SYS_ADMIN -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-android-docker-instrumentation-tests.sh",
     "test-android-run-unit": "docker run --cap-add=SYS_ADMIN -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-android-docker-unit-tests.sh",
@@ -100,20 +99,16 @@
     "test-ios": "./scripts/objc-test.sh test",
     "test-typescript": "dtslint types"
   },
-  "workspaces": [
-    "packages/*",
-    "repo-config"
-  ],
   "peerDependencies": {
     "react": "18.2.0"
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.2.1",
-    "@react-native-community/cli": "10.0.0-alpha.2",
-    "@react-native-community/cli-platform-android": "10.0.0-alpha.2",
-    "@react-native-community/cli-platform-ios": "10.0.0-alpha.1",
+    "@react-native-community/cli": "10.0.0-alpha.5",
+    "@react-native-community/cli-platform-android": "10.0.0-alpha.4",
+    "@react-native-community/cli-platform-ios": "10.0.0-alpha.3",
     "@react-native/assets": "1.0.0",
-    "@react-native/normalize-color": "2.0.0",
+    "@react-native/normalize-color": "2.1.0",
     "@react-native/polyfills": "2.0.0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
@@ -132,7 +127,7 @@
     "pretty-format": "^26.5.2",
     "promise": "^8.3.0",
     "react-devtools-core": "^4.26.1",
-    "react-native-gradle-plugin": "^0.71.8",
+    "react-native-gradle-plugin": "^0.71.10",
     "react-refresh": "^0.4.0",
     "react-shallow-renderer": "^16.15.0",
     "regenerator-runtime": "^0.13.2",
@@ -140,13 +135,56 @@
     "stacktrace-parser": "^0.1.3",
     "use-sync-external-store": "^1.0.0",
     "whatwg-fetch": "^3.0.0",
-    "ws": "^6.2.2"
+    "ws": "^6.2.2",
+    "react-native-codegen": "^0.71.3"
   },
   "devDependencies": {
     "flow-bin": "^0.191.0",
     "hermes-eslint": "0.8.0",
     "react": "18.2.0",
-    "react-test-renderer": "^18.2.0"
+    "react-test-renderer": "18.2.0",
+    "@babel/core": "^7.14.0",
+    "@babel/eslint-parser": "^7.18.2",
+    "@babel/generator": "^7.14.0",
+    "@babel/plugin-transform-regenerator": "^7.0.0",
+    "@definitelytyped/dtslint": "^0.0.127",
+    "@react-native-community/eslint-config": "*",
+    "@react-native-community/eslint-plugin": "*",
+    "@react-native/eslint-plugin-specs": "^0.71.1",
+    "@reactions/component": "^2.0.2",
+    "@types/react": "^18.0.18",
+    "@typescript-eslint/parser": "^5.30.5",
+    "async": "^3.2.2",
+    "clang-format": "^1.8.0",
+    "connect": "^3.6.5",
+    "coveralls": "^3.1.1",
+    "eslint": "^8.19.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-babel": "^5.3.1",
+    "eslint-plugin-eslint-comments": "^3.2.0",
+    "eslint-plugin-ft-flow": "^2.0.1",
+    "eslint-plugin-jest": "^26.5.3",
+    "eslint-plugin-jsx-a11y": "^6.6.0",
+    "eslint-plugin-lint": "^1.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-react": "^7.30.1",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react-native": "^4.0.0",
+    "eslint-plugin-relay": "^1.8.3",
+    "inquirer": "^7.1.0",
+    "jest": "^29.2.1",
+    "jest-junit": "^10.0.0",
+    "jscodeshift": "^0.13.1",
+    "metro-babel-register": "0.73.3",
+    "metro-memory-fs": "0.73.3",
+    "mkdirp": "^0.5.1",
+    "mock-fs": "^5.1.4",
+    "prettier": "^2.4.1",
+    "shelljs": "^0.8.5",
+    "signedsource": "^1.0.0",
+    "typescript": "4.1.3",
+    "ws": "^6.2.2",
+    "yargs": "^17.5.1"
   },
   "codegenConfig": {
     "libraries": [
@@ -166,4 +204,4 @@
       }
     ]
   }
-}
+}

packages/babel-plugin-codegen/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.71.0",
+  "version": "0.71.1",
   "name": "@react-native/babel-plugin-codegen",
   "description": "Babel plugin to generate native module and view manager code for React Native.",
   "repository": {

packages/eslint-config-react-native-community/BUCK

@@ -0,0 +1,23 @@
+load("@fbsource//tools/build_defs/third_party:yarn_defs.bzl", "yarn_workspace")
+
+yarn_workspace(
+    name = "yarn-workspace",
+    srcs = glob(
+        ["**/*.js"],
+        exclude = [
+            "**/__fixtures__/**",
+            "**/__flowtests__/**",
+            "**/__mocks__/**",
+            "**/__server_snapshot_tests__/**",
+            "**/__tests__/**",
+            "**/node_modules/**",
+            "**/node_modules/.bin/**",
+            "**/.*",
+            "**/.*/**",
+            "**/.*/.*",
+            "**/*.xcodeproj/**",
+            "**/*.xcworkspace/**",
+        ],
+    ),
+    visibility = ["PUBLIC"],
+)

packages/eslint-config-react-native-community/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-community/eslint-config",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "ESLint config for React Native",
   "main": "index.js",
   "license": "MIT",

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

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-community/eslint-plugin",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "ESLint rules for @react-native-community/eslint-config",
   "main": "index.js",
   "repository": {

packages/eslint-plugin-specs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/eslint-plugin-specs",
-  "version": "0.71.0",
+  "version": "0.71.1",
   "description": "ESLint rules to validate NativeModule and Component Specs",
   "main": "index.js",
   "repository": {

packages/hermes-inspector-msggen/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@react-native/hermes-inspector-msggen",
   "private": true,
-  "version": "0.71.0",
+  "version": "0.71.1",
   "license": "MIT",
   "bin": {
     "msggen": "./bin/index.js"

packages/normalize-color/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/normalize-color",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "Color normalization for React Native.",
   "repository": {
     "type": "git",

packages/react-native-codegen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-codegen",
-  "version": "0.71.1",
+  "version": "0.71.3",
   "description": "⚛️ Code generation tools for React Native",
   "homepage": "https://github.com/facebook/react-native/tree/HEAD/packages/react-native-codegen",
   "repository": {

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

@@ -118,9 +118,10 @@ function serializeArg(
   index: number,
   resolveAlias: AliasResolver,
 ): string {
-  const {typeAnnotation: nullableTypeAnnotation} = arg;
+  const {typeAnnotation: nullableTypeAnnotation, optional} = arg;
   const [typeAnnotation, nullable] =
     unwrapNullable<NativeModuleParamTypeAnnotation>(nullableTypeAnnotation);
+  const isRequired = !optional && !nullable;
 
   let realTypeAnnotation = typeAnnotation;
   if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
@@ -130,12 +131,15 @@ function serializeArg(
   function wrap(callback: (val: string) => string) {
     const val = `args[${index}]`;
     const expression = callback(val);
-
-    if (nullable) {
-      return `${val}.isNull() || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`;
+    if (isRequired) {
+      return expression;
+    } else {
+      let condition = `${val}.isNull() || ${val}.isUndefined()`;
+      if (optional) {
+        condition = `count < ${index} || ${condition}`;
+      }
+      return `${condition} ? std::nullopt : std::make_optional(${expression})`;
     }
-
-    return expression;
   }
 
   switch (realTypeAnnotation.type) {

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

@@ -16,6 +16,7 @@ import type {
   NativeModuleTypeAnnotation,
   NativeModuleFunctionTypeAnnotation,
   NativeModulePropertyShape,
+  NativeModuleAliasMap,
 } from '../../CodegenSchema';
 
 import type {AliasResolver} from './Utils';
@@ -28,8 +29,13 @@ type FilesOutput = Map<string, string>;
 const ModuleClassDeclarationTemplate = ({
   hasteModuleName,
   moduleProperties,
-}: $ReadOnly<{hasteModuleName: string, moduleProperties: string[]}>) => {
-  return `class JSI_EXPORT ${hasteModuleName}CxxSpecJSI : public TurboModule {
+  structs,
+}: $ReadOnly<{
+  hasteModuleName: string,
+  moduleProperties: string[],
+  structs: string,
+}>) => {
+  return `${structs}class JSI_EXPORT ${hasteModuleName}CxxSpecJSI : public TurboModule {
 protected:
   ${hasteModuleName}CxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
 
@@ -107,12 +113,14 @@ ${modules.join('\n\n')}
 
 function translatePrimitiveJSTypeToCpp(
   nullableTypeAnnotation: Nullable<NativeModuleTypeAnnotation>,
+  optional: boolean,
   createErrorMessage: (typeName: string) => string,
   resolveAlias: AliasResolver,
 ) {
   const [typeAnnotation, nullable] = unwrapNullable<NativeModuleTypeAnnotation>(
     nullableTypeAnnotation,
   );
+  const isRequired = !optional && !nullable;
 
   let realTypeAnnotation = typeAnnotation;
   if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
@@ -120,7 +128,7 @@ function translatePrimitiveJSTypeToCpp(
   }
 
   function wrap(type: string) {
-    return nullable ? `std::optional<${type}>` : type;
+    return isRequired ? type : `std::optional<${type}>`;
   }
 
   switch (realTypeAnnotation.type) {
@@ -184,6 +192,76 @@ function translatePrimitiveJSTypeToCpp(
   }
 }
 
+function createStructs(
+  moduleName: string,
+  aliasMap: NativeModuleAliasMap,
+  resolveAlias: AliasResolver,
+): string {
+  return Object.keys(aliasMap)
+    .map(alias => {
+      const value = aliasMap[alias];
+      if (value.properties.length === 0) {
+        return '';
+      }
+      const structName = `${moduleName}Base${alias}`;
+      const templateParameterWithTypename = value.properties
+        .map((v, i) => 'typename P' + i)
+        .join(', ');
+      const templateParameter = value.properties
+        .map((v, i) => 'P' + i)
+        .join(', ');
+      return `#pragma mark - ${structName}
+
+template <${templateParameterWithTypename}>
+struct ${structName} {
+${value.properties.map((v, i) => '  P' + i + ' ' + v.name).join(';\n')};
+  bool operator==(const ${structName} &other) const {
+    return ${value.properties
+      .map(v => `${v.name} == other.${v.name}`)
+      .join(' && ')};
+  }
+};
+
+template <${templateParameterWithTypename}>
+struct ${structName}Bridging {
+  static ${structName}<${templateParameter}> fromJs(
+      jsi::Runtime &rt,
+      const jsi::Object &value,
+      const std::shared_ptr<CallInvoker> &jsInvoker) {
+    ${structName}<${templateParameter}> result{
+${value.properties
+  .map(
+    (v, i) =>
+      `      bridging::fromJs<P${i}>(rt, value.getProperty(rt, "${v.name}"), jsInvoker)`,
+  )
+  .join(',\n')}};
+    return result;
+  }
+
+  static jsi::Object toJs(
+      jsi::Runtime &rt,
+      const ${structName}<${templateParameter}> &value) {
+    auto result = facebook::jsi::Object(rt);
+${value.properties
+  .map((v, i) => {
+    if (v.optional) {
+      return `    if (value.${v.name}) {
+      result.setProperty(rt, "${v.name}", bridging::toJs(rt, value.${v.name}.value()));
+    }`;
+    } else {
+      return `    result.setProperty(rt, "${v.name}", bridging::toJs(rt, value.${v.name}));`;
+    }
+  })
+  .join('\n')}
+    return result;
+  }
+};
+
+`;
+    })
+    .join('\n');
+}
+
 function translatePropertyToCpp(
   prop: NativeModulePropertyShape,
   resolveAlias: AliasResolver,
@@ -199,6 +277,7 @@ function translatePropertyToCpp(
   const paramTypes = propTypeAnnotation.params.map(param => {
     const translatedParam = translatePrimitiveJSTypeToCpp(
       param.typeAnnotation,
+      param.optional,
       typeName =>
         `Unsupported type for param "${param.name}" in ${prop.name}. Found: ${typeName}`,
       resolveAlias,
@@ -208,6 +287,7 @@ function translatePropertyToCpp(
 
   const returnType = translatePrimitiveJSTypeToCpp(
     propTypeAnnotation.returnTypeAnnotation,
+    false,
     typeName => `Unsupported return type for ${prop.name}. Found: ${typeName}`,
     resolveAlias,
   );
@@ -247,6 +327,7 @@ module.exports = {
         moduleNames: [moduleName],
       } = nativeModules[hasteModuleName];
       const resolveAlias = createAliasResolver(aliases);
+      const structs = createStructs(moduleName, aliases, resolveAlias);
 
       return [
         ModuleClassDeclarationTemplate({
@@ -254,6 +335,7 @@ module.exports = {
           moduleProperties: properties.map(prop =>
             translatePropertyToCpp(prop, resolveAlias, true),
           ),
+          structs,
         }),
         ModuleSpecClassDeclarationTemplate({
           hasteModuleName,

packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js

@@ -275,6 +275,25 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
               ],
             },
           },
+          {
+            name: 'getValueWithOptionalArg',
+            optional: false,
+            typeAnnotation: {
+              type: 'FunctionTypeAnnotation',
+              returnTypeAnnotation: {
+                type: 'PromiseTypeAnnotation',
+              },
+              params: [
+                {
+                  optional: true,
+                  name: 'parameter',
+                  typeAnnotation: {
+                    type: 'GenericObjectTypeAnnotation',
+                  },
+                },
+              ],
+            },
+          },
           {
             name: 'getEnums',
             optional: false,
@@ -1205,73 +1224,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
       },
       moduleNames: ['CameraRollManager'],
     },
-    NativeImagePickerIOS: {
-      type: 'NativeModule',
-      aliases: {},
-      spec: {
-        properties: [
-          {
-            name: 'openCameraDialog',
-            optional: false,
-            typeAnnotation: {
-              type: 'FunctionTypeAnnotation',
-              returnTypeAnnotation: {
-                type: 'VoidTypeAnnotation',
-              },
-              params: [
-                {
-                  optional: false,
-                  name: 'config',
-                  typeAnnotation: {
-                    type: 'ObjectTypeAnnotation',
-                    properties: [
-                      {
-                        optional: false,
-                        name: 'unmirrorFrontFacingCamera',
-                        typeAnnotation: {
-                          type: 'BooleanTypeAnnotation',
-                        },
-                      },
-                      {
-                        optional: false,
-                        name: 'videoMode',
-                        typeAnnotation: {
-                          type: 'BooleanTypeAnnotation',
-                        },
-                      },
-                    ],
-                  },
-                },
-                {
-                  name: 'successCallback',
-                  optional: false,
-                  typeAnnotation: {
-                    type: 'FunctionTypeAnnotation',
-                    params: [],
-                    returnTypeAnnotation: {
-                      type: 'VoidTypeAnnotation',
-                    },
-                  },
-                },
-                {
-                  name: 'cancelCallback',
-                  optional: false,
-                  typeAnnotation: {
-                    type: 'FunctionTypeAnnotation',
-                    params: [],
-                    returnTypeAnnotation: {
-                      type: 'VoidTypeAnnotation',
-                    },
-                  },
-                },
-              ],
-            },
-          },
-        ],
-      },
-      moduleNames: ['ImagePickerIOS'],
-      excludedPlatforms: ['android'],
-    },
     NativeExceptionsManager: {
       type: 'NativeModule',
       aliases: {

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

@@ -54,7 +54,7 @@ static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_optionals(jsi
   return jsi::Value::undefined();
 }
 static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_optionalMethod(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->optionalMethod(rt, args[0].asObject(rt), args[1].asObject(rt).asFunction(rt), args[2].asObject(rt).asArray(rt));
+  static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->optionalMethod(rt, args[0].asObject(rt), args[1].asObject(rt).asFunction(rt), count < 2 || args[2].isNull() || args[2].isUndefined() ? std::nullopt : std::make_optional(args[2].asObject(rt).asArray(rt)));
   return jsi::Value::undefined();
 }
 static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getArrays(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
@@ -240,15 +240,6 @@ NativeCameraRollManagerCxxSpecJSI::NativeCameraRollManagerCxxSpecJSI(std::shared
   methodMap_[\\"saveToCameraRoll\\"] = MethodMetadata {2, __hostFunction_NativeCameraRollManagerCxxSpecJSI_saveToCameraRoll};
   methodMap_[\\"deletePhotos\\"] = MethodMetadata {1, __hostFunction_NativeCameraRollManagerCxxSpecJSI_deletePhotos};
 }
-static jsi::Value __hostFunction_NativeImagePickerIOSCxxSpecJSI_openCameraDialog(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
-  static_cast<NativeImagePickerIOSCxxSpecJSI *>(&turboModule)->openCameraDialog(rt, args[0].asObject(rt), args[1].asObject(rt).asFunction(rt), args[2].asObject(rt).asFunction(rt));
-  return jsi::Value::undefined();
-}
-
-NativeImagePickerIOSCxxSpecJSI::NativeImagePickerIOSCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule(\\"ImagePickerIOS\\", jsInvoker) {
-  methodMap_[\\"openCameraDialog\\"] = MethodMetadata {3, __hostFunction_NativeImagePickerIOSCxxSpecJSI_openCameraDialog};
-}
 static jsi::Value __hostFunction_NativeExceptionsManagerCxxSpecJSI_reportFatalException(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeExceptionsManagerCxxSpecJSI *>(&turboModule)->reportFatalException(rt, args[0].asString(rt), args[1].asObject(rt).asArray(rt), args[2].asNumber());
   return jsi::Value::undefined();
@@ -337,6 +328,9 @@ static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithC
 static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithPromise(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getValueWithPromise(rt, args[0].asBool());
 }
+static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithOptionalArg(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+  return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getValueWithOptionalArg(rt, count < 0 || args[0].isNull() || args[0].isUndefined() ? std::nullopt : std::make_optional(args[0].asObject(rt)));
+}
 static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getEnums(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getEnums(rt, args[0].asNumber(), args[1].asNumber(), args[2].asString(rt));
 }
@@ -354,6 +348,7 @@ NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared
   methodMap_[\\"getValue\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValue};
   methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithCallback};
   methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithPromise};
+  methodMap_[\\"getValueWithOptionalArg\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithOptionalArg};
   methodMap_[\\"getEnums\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getEnums};
 }
 

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

@@ -87,7 +87,7 @@ protected:
 public:
   virtual jsi::Object difficult(jsi::Runtime &rt, jsi::Object A) = 0;
   virtual void optionals(jsi::Runtime &rt, jsi::Object A) = 0;
-  virtual void optionalMethod(jsi::Runtime &rt, jsi::Object options, jsi::Function callback, jsi::Array extras) = 0;
+  virtual void optionalMethod(jsi::Runtime &rt, jsi::Object options, jsi::Function callback, std::optional<jsi::Array> extras) = 0;
   virtual void getArrays(jsi::Runtime &rt, jsi::Object options) = 0;
   virtual std::optional<jsi::Object> getNullableObject(jsi::Runtime &rt) = 0;
   virtual std::optional<jsi::Object> getNullableGenericObject(jsi::Runtime &rt) = 0;
@@ -129,7 +129,7 @@ private:
       return bridging::callFromJs<void>(
           rt, &T::optionals, jsInvoker_, instance_, std::move(A));
     }
-    void optionalMethod(jsi::Runtime &rt, jsi::Object options, jsi::Function callback, jsi::Array extras) override {
+    void optionalMethod(jsi::Runtime &rt, jsi::Object options, jsi::Function callback, std::optional<jsi::Array> extras) override {
       static_assert(
           bridging::getParameterCount(&T::optionalMethod) == 4,
           \\"Expected optionalMethod(...) to have 4 parameters\\");
@@ -202,6 +202,36 @@ Map {
 namespace facebook {
 namespace react {
 
+#pragma mark - SampleTurboModuleCxxBaseObjectAlias
+
+template <typename P0>
+struct SampleTurboModuleCxxBaseObjectAlias {
+  P0 x;
+  bool operator==(const SampleTurboModuleCxxBaseObjectAlias &other) const {
+    return x == other.x;
+  }
+};
+
+template <typename P0>
+struct SampleTurboModuleCxxBaseObjectAliasBridging {
+  static SampleTurboModuleCxxBaseObjectAlias<P0> fromJs(
+      jsi::Runtime &rt,
+      const jsi::Object &value,
+      const std::shared_ptr<CallInvoker> &jsInvoker) {
+    SampleTurboModuleCxxBaseObjectAlias<P0> result{
+      bridging::fromJs<P0>(rt, value.getProperty(rt, \\"x\\"), jsInvoker)};
+    return result;
+  }
+
+  static jsi::Object toJs(
+      jsi::Runtime &rt,
+      const SampleTurboModuleCxxBaseObjectAlias<P0> &value) {
+    auto result = facebook::jsi::Object(rt);
+    result.setProperty(rt, \\"x\\", bridging::toJs(rt, value.x));
+    return result;
+  }
+};
+
 class JSI_EXPORT NativeSampleTurboModuleCxxSpecJSI : public TurboModule {
 protected:
   NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
@@ -358,6 +388,54 @@ Map {
 namespace facebook {
 namespace react {
 
+#pragma mark - AliasTurboModuleBaseOptions
+
+template <typename P0, typename P1, typename P2, typename P3, typename P4>
+struct AliasTurboModuleBaseOptions {
+  P0 offset;
+  P1 size;
+  P2 displaySize;
+  P3 resizeMode;
+  P4 allowExternalStorage;
+  bool operator==(const AliasTurboModuleBaseOptions &other) const {
+    return offset == other.offset && size == other.size && displaySize == other.displaySize && resizeMode == other.resizeMode && allowExternalStorage == other.allowExternalStorage;
+  }
+};
+
+template <typename P0, typename P1, typename P2, typename P3, typename P4>
+struct AliasTurboModuleBaseOptionsBridging {
+  static AliasTurboModuleBaseOptions<P0, P1, P2, P3, P4> fromJs(
+      jsi::Runtime &rt,
+      const jsi::Object &value,
+      const std::shared_ptr<CallInvoker> &jsInvoker) {
+    AliasTurboModuleBaseOptions<P0, P1, P2, P3, P4> result{
+      bridging::fromJs<P0>(rt, value.getProperty(rt, \\"offset\\"), jsInvoker),
+      bridging::fromJs<P1>(rt, value.getProperty(rt, \\"size\\"), jsInvoker),
+      bridging::fromJs<P2>(rt, value.getProperty(rt, \\"displaySize\\"), jsInvoker),
+      bridging::fromJs<P3>(rt, value.getProperty(rt, \\"resizeMode\\"), jsInvoker),
+      bridging::fromJs<P4>(rt, value.getProperty(rt, \\"allowExternalStorage\\"), jsInvoker)};
+    return result;
+  }
+
+  static jsi::Object toJs(
+      jsi::Runtime &rt,
+      const AliasTurboModuleBaseOptions<P0, P1, P2, P3, P4> &value) {
+    auto result = facebook::jsi::Object(rt);
+    result.setProperty(rt, \\"offset\\", bridging::toJs(rt, value.offset));
+    result.setProperty(rt, \\"size\\", bridging::toJs(rt, value.size));
+    if (value.displaySize) {
+      result.setProperty(rt, \\"displaySize\\", bridging::toJs(rt, value.displaySize.value()));
+    }
+    if (value.resizeMode) {
+      result.setProperty(rt, \\"resizeMode\\", bridging::toJs(rt, value.resizeMode.value()));
+    }
+    if (value.allowExternalStorage) {
+      result.setProperty(rt, \\"allowExternalStorage\\", bridging::toJs(rt, value.allowExternalStorage.value()));
+    }
+    return result;
+  }
+};
+
 class JSI_EXPORT AliasTurboModuleCxxSpecJSI : public TurboModule {
 protected:
   AliasTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
@@ -435,6 +513,179 @@ Map {
 namespace facebook {
 namespace react {
 
+#pragma mark - CameraRollManagerBasePhotoIdentifierImage
+
+template <typename P0, typename P1, typename P2, typename P3, typename P4, typename P5>
+struct CameraRollManagerBasePhotoIdentifierImage {
+  P0 uri;
+  P1 playableDuration;
+  P2 width;
+  P3 height;
+  P4 isStored;
+  P5 filename;
+  bool operator==(const CameraRollManagerBasePhotoIdentifierImage &other) const {
+    return uri == other.uri && playableDuration == other.playableDuration && width == other.width && height == other.height && isStored == other.isStored && filename == other.filename;
+  }
+};
+
+template <typename P0, typename P1, typename P2, typename P3, typename P4, typename P5>
+struct CameraRollManagerBasePhotoIdentifierImageBridging {
+  static CameraRollManagerBasePhotoIdentifierImage<P0, P1, P2, P3, P4, P5> fromJs(
+      jsi::Runtime &rt,
+      const jsi::Object &value,
+      const std::shared_ptr<CallInvoker> &jsInvoker) {
+    CameraRollManagerBasePhotoIdentifierImage<P0, P1, P2, P3, P4, P5> result{
+      bridging::fromJs<P0>(rt, value.getProperty(rt, \\"uri\\"), jsInvoker),
+      bridging::fromJs<P1>(rt, value.getProperty(rt, \\"playableDuration\\"), jsInvoker),
+      bridging::fromJs<P2>(rt, value.getProperty(rt, \\"width\\"), jsInvoker),
+      bridging::fromJs<P3>(rt, value.getProperty(rt, \\"height\\"), jsInvoker),
+      bridging::fromJs<P4>(rt, value.getProperty(rt, \\"isStored\\"), jsInvoker),
+      bridging::fromJs<P5>(rt, value.getProperty(rt, \\"filename\\"), jsInvoker)};
+    return result;
+  }
+
+  static jsi::Object toJs(
+      jsi::Runtime &rt,
+      const CameraRollManagerBasePhotoIdentifierImage<P0, P1, P2, P3, P4, P5> &value) {
+    auto result = facebook::jsi::Object(rt);
+    result.setProperty(rt, \\"uri\\", bridging::toJs(rt, value.uri));
+    result.setProperty(rt, \\"playableDuration\\", bridging::toJs(rt, value.playableDuration));
+    result.setProperty(rt, \\"width\\", bridging::toJs(rt, value.width));
+    result.setProperty(rt, \\"height\\", bridging::toJs(rt, value.height));
+    if (value.isStored) {
+      result.setProperty(rt, \\"isStored\\", bridging::toJs(rt, value.isStored.value()));
+    }
+    result.setProperty(rt, \\"filename\\", bridging::toJs(rt, value.filename));
+    return result;
+  }
+};
+
+
+#pragma mark - CameraRollManagerBasePhotoIdentifier
+
+template <typename P0>
+struct CameraRollManagerBasePhotoIdentifier {
+  P0 node;
+  bool operator==(const CameraRollManagerBasePhotoIdentifier &other) const {
+    return node == other.node;
+  }
+};
+
+template <typename P0>
+struct CameraRollManagerBasePhotoIdentifierBridging {
+  static CameraRollManagerBasePhotoIdentifier<P0> fromJs(
+      jsi::Runtime &rt,
+      const jsi::Object &value,
+      const std::shared_ptr<CallInvoker> &jsInvoker) {
+    CameraRollManagerBasePhotoIdentifier<P0> result{
+      bridging::fromJs<P0>(rt, value.getProperty(rt, \\"node\\"), jsInvoker)};
+    return result;
+  }
+
+  static jsi::Object toJs(
+      jsi::Runtime &rt,
+      const CameraRollManagerBasePhotoIdentifier<P0> &value) {
+    auto result = facebook::jsi::Object(rt);
+    result.setProperty(rt, \\"node\\", bridging::toJs(rt, value.node));
+    return result;
+  }
+};
+
+
+#pragma mark - CameraRollManagerBasePhotoIdentifiersPage
+
+template <typename P0, typename P1>
+struct CameraRollManagerBasePhotoIdentifiersPage {
+  P0 edges;
+  P1 page_info;
+  bool operator==(const CameraRollManagerBasePhotoIdentifiersPage &other) const {
+    return edges == other.edges && page_info == other.page_info;
+  }
+};
+
+template <typename P0, typename P1>
+struct CameraRollManagerBasePhotoIdentifiersPageBridging {
+  static CameraRollManagerBasePhotoIdentifiersPage<P0, P1> fromJs(
+      jsi::Runtime &rt,
+      const jsi::Object &value,
+      const std::shared_ptr<CallInvoker> &jsInvoker) {
+    CameraRollManagerBasePhotoIdentifiersPage<P0, P1> result{
+      bridging::fromJs<P0>(rt, value.getProperty(rt, \\"edges\\"), jsInvoker),
+      bridging::fromJs<P1>(rt, value.getProperty(rt, \\"page_info\\"), jsInvoker)};
+    return result;
+  }
+
+  static jsi::Object toJs(
+      jsi::Runtime &rt,
+      const CameraRollManagerBasePhotoIdentifiersPage<P0, P1> &value) {
+    auto result = facebook::jsi::Object(rt);
+    result.setProperty(rt, \\"edges\\", bridging::toJs(rt, value.edges));
+    result.setProperty(rt, \\"page_info\\", bridging::toJs(rt, value.page_info));
+    return result;
+  }
+};
+
+
+#pragma mark - CameraRollManagerBaseGetPhotosParams
+
+template <typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6>
+struct CameraRollManagerBaseGetPhotosParams {
+  P0 first;
+  P1 after;
+  P2 groupName;
+  P3 groupTypes;
+  P4 assetType;
+  P5 maxSize;
+  P6 mimeTypes;
+  bool operator==(const CameraRollManagerBaseGetPhotosParams &other) const {
+    return first == other.first && after == other.after && groupName == other.groupName && groupTypes == other.groupTypes && assetType == other.assetType && maxSize == other.maxSize && mimeTypes == other.mimeTypes;
+  }
+};
+
+template <typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6>
+struct CameraRollManagerBaseGetPhotosParamsBridging {
+  static CameraRollManagerBaseGetPhotosParams<P0, P1, P2, P3, P4, P5, P6> fromJs(
+      jsi::Runtime &rt,
+      const jsi::Object &value,
+      const std::shared_ptr<CallInvoker> &jsInvoker) {
+    CameraRollManagerBaseGetPhotosParams<P0, P1, P2, P3, P4, P5, P6> result{
+      bridging::fromJs<P0>(rt, value.getProperty(rt, \\"first\\"), jsInvoker),
+      bridging::fromJs<P1>(rt, value.getProperty(rt, \\"after\\"), jsInvoker),
+      bridging::fromJs<P2>(rt, value.getProperty(rt, \\"groupName\\"), jsInvoker),
+      bridging::fromJs<P3>(rt, value.getProperty(rt, \\"groupTypes\\"), jsInvoker),
+      bridging::fromJs<P4>(rt, value.getProperty(rt, \\"assetType\\"), jsInvoker),
+      bridging::fromJs<P5>(rt, value.getProperty(rt, \\"maxSize\\"), jsInvoker),
+      bridging::fromJs<P6>(rt, value.getProperty(rt, \\"mimeTypes\\"), jsInvoker)};
+    return result;
+  }
+
+  static jsi::Object toJs(
+      jsi::Runtime &rt,
+      const CameraRollManagerBaseGetPhotosParams<P0, P1, P2, P3, P4, P5, P6> &value) {
+    auto result = facebook::jsi::Object(rt);
+    result.setProperty(rt, \\"first\\", bridging::toJs(rt, value.first));
+    if (value.after) {
+      result.setProperty(rt, \\"after\\", bridging::toJs(rt, value.after.value()));
+    }
+    if (value.groupName) {
+      result.setProperty(rt, \\"groupName\\", bridging::toJs(rt, value.groupName.value()));
+    }
+    if (value.groupTypes) {
+      result.setProperty(rt, \\"groupTypes\\", bridging::toJs(rt, value.groupTypes.value()));
+    }
+    if (value.assetType) {
+      result.setProperty(rt, \\"assetType\\", bridging::toJs(rt, value.assetType.value()));
+    }
+    if (value.maxSize) {
+      result.setProperty(rt, \\"maxSize\\", bridging::toJs(rt, value.maxSize.value()));
+    }
+    if (value.mimeTypes) {
+      result.setProperty(rt, \\"mimeTypes\\", bridging::toJs(rt, value.mimeTypes.value()));
+    }
+    return result;
+  }
+};
+
 class JSI_EXPORT NativeCameraRollManagerCxxSpecJSI : public TurboModule {
 protected:
   NativeCameraRollManagerCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
@@ -505,47 +756,106 @@ private:
   Delegate delegate_;
 };
 
-class JSI_EXPORT NativeImagePickerIOSCxxSpecJSI : public TurboModule {
-protected:
-  NativeImagePickerIOSCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
-
-public:
-  virtual void openCameraDialog(jsi::Runtime &rt, jsi::Object config, jsi::Function successCallback, jsi::Function cancelCallback) = 0;
+#pragma mark - ExceptionsManagerBaseStackFrame
 
+template <typename P0, typename P1, typename P2, typename P3, typename P4>
+struct ExceptionsManagerBaseStackFrame {
+  P0 column;
+  P1 file;
+  P2 lineNumber;
+  P3 methodName;
+  P4 collapse;
+  bool operator==(const ExceptionsManagerBaseStackFrame &other) const {
+    return column == other.column && file == other.file && lineNumber == other.lineNumber && methodName == other.methodName && collapse == other.collapse;
+  }
 };
 
-template <typename T>
-class JSI_EXPORT NativeImagePickerIOSCxxSpec : public TurboModule {
-public:
-  jsi::Value get(jsi::Runtime &rt, const jsi::PropNameID &propName) override {
-    return delegate_.get(rt, propName);
+template <typename P0, typename P1, typename P2, typename P3, typename P4>
+struct ExceptionsManagerBaseStackFrameBridging {
+  static ExceptionsManagerBaseStackFrame<P0, P1, P2, P3, P4> fromJs(
+      jsi::Runtime &rt,
+      const jsi::Object &value,
+      const std::shared_ptr<CallInvoker> &jsInvoker) {
+    ExceptionsManagerBaseStackFrame<P0, P1, P2, P3, P4> result{
+      bridging::fromJs<P0>(rt, value.getProperty(rt, \\"column\\"), jsInvoker),
+      bridging::fromJs<P1>(rt, value.getProperty(rt, \\"file\\"), jsInvoker),
+      bridging::fromJs<P2>(rt, value.getProperty(rt, \\"lineNumber\\"), jsInvoker),
+      bridging::fromJs<P3>(rt, value.getProperty(rt, \\"methodName\\"), jsInvoker),
+      bridging::fromJs<P4>(rt, value.getProperty(rt, \\"collapse\\"), jsInvoker)};
+    return result;
   }
 
-protected:
-  NativeImagePickerIOSCxxSpec(std::shared_ptr<CallInvoker> jsInvoker)
-    : TurboModule(\\"ImagePickerIOS\\", jsInvoker),
-      delegate_(static_cast<T*>(this), jsInvoker) {}
-
-private:
-  class Delegate : public NativeImagePickerIOSCxxSpecJSI {
-  public:
-    Delegate(T *instance, std::shared_ptr<CallInvoker> jsInvoker) :
-      NativeImagePickerIOSCxxSpecJSI(std::move(jsInvoker)), instance_(instance) {}
-
-    void openCameraDialog(jsi::Runtime &rt, jsi::Object config, jsi::Function successCallback, jsi::Function cancelCallback) override {
-      static_assert(
-          bridging::getParameterCount(&T::openCameraDialog) == 4,
-          \\"Expected openCameraDialog(...) to have 4 parameters\\");
-
-      return bridging::callFromJs<void>(
-          rt, &T::openCameraDialog, jsInvoker_, instance_, std::move(config), std::move(successCallback), std::move(cancelCallback));
+  static jsi::Object toJs(
+      jsi::Runtime &rt,
+      const ExceptionsManagerBaseStackFrame<P0, P1, P2, P3, P4> &value) {
+    auto result = facebook::jsi::Object(rt);
+    if (value.column) {
+      result.setProperty(rt, \\"column\\", bridging::toJs(rt, value.column.value()));
     }
+    result.setProperty(rt, \\"file\\", bridging::toJs(rt, value.file));
+    if (value.lineNumber) {
+      result.setProperty(rt, \\"lineNumber\\", bridging::toJs(rt, value.lineNumber.value()));
+    }
+    result.setProperty(rt, \\"methodName\\", bridging::toJs(rt, value.methodName));
+    if (value.collapse) {
+      result.setProperty(rt, \\"collapse\\", bridging::toJs(rt, value.collapse.value()));
+    }
+    return result;
+  }
+};
 
-  private:
-    T *instance_;
-  };
 
-  Delegate delegate_;
+#pragma mark - ExceptionsManagerBaseExceptionData
+
+template <typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7>
+struct ExceptionsManagerBaseExceptionData {
+  P0 message;
+  P1 originalMessage;
+  P2 name;
+  P3 componentStack;
+  P4 stack;
+  P5 id;
+  P6 isFatal;
+  P7 extraData;
+  bool operator==(const ExceptionsManagerBaseExceptionData &other) const {
+    return message == other.message && originalMessage == other.originalMessage && name == other.name && componentStack == other.componentStack && stack == other.stack && id == other.id && isFatal == other.isFatal && extraData == other.extraData;
+  }
+};
+
+template <typename P0, typename P1, typename P2, typename P3, typename P4, typename P5, typename P6, typename P7>
+struct ExceptionsManagerBaseExceptionDataBridging {
+  static ExceptionsManagerBaseExceptionData<P0, P1, P2, P3, P4, P5, P6, P7> fromJs(
+      jsi::Runtime &rt,
+      const jsi::Object &value,
+      const std::shared_ptr<CallInvoker> &jsInvoker) {
+    ExceptionsManagerBaseExceptionData<P0, P1, P2, P3, P4, P5, P6, P7> result{
+      bridging::fromJs<P0>(rt, value.getProperty(rt, \\"message\\"), jsInvoker),
+      bridging::fromJs<P1>(rt, value.getProperty(rt, \\"originalMessage\\"), jsInvoker),
+      bridging::fromJs<P2>(rt, value.getProperty(rt, \\"name\\"), jsInvoker),
+      bridging::fromJs<P3>(rt, value.getProperty(rt, \\"componentStack\\"), jsInvoker),
+      bridging::fromJs<P4>(rt, value.getProperty(rt, \\"stack\\"), jsInvoker),
+      bridging::fromJs<P5>(rt, value.getProperty(rt, \\"id\\"), jsInvoker),
+      bridging::fromJs<P6>(rt, value.getProperty(rt, \\"isFatal\\"), jsInvoker),
+      bridging::fromJs<P7>(rt, value.getProperty(rt, \\"extraData\\"), jsInvoker)};
+    return result;
+  }
+
+  static jsi::Object toJs(
+      jsi::Runtime &rt,
+      const ExceptionsManagerBaseExceptionData<P0, P1, P2, P3, P4, P5, P6, P7> &value) {
+    auto result = facebook::jsi::Object(rt);
+    result.setProperty(rt, \\"message\\", bridging::toJs(rt, value.message));
+    result.setProperty(rt, \\"originalMessage\\", bridging::toJs(rt, value.originalMessage));
+    result.setProperty(rt, \\"name\\", bridging::toJs(rt, value.name));
+    result.setProperty(rt, \\"componentStack\\", bridging::toJs(rt, value.componentStack));
+    result.setProperty(rt, \\"stack\\", bridging::toJs(rt, value.stack));
+    result.setProperty(rt, \\"id\\", bridging::toJs(rt, value.id));
+    result.setProperty(rt, \\"isFatal\\", bridging::toJs(rt, value.isFatal));
+    if (value.extraData) {
+      result.setProperty(rt, \\"extraData\\", bridging::toJs(rt, value.extraData.value()));
+    }
+    return result;
+  }
 };
 
 class JSI_EXPORT NativeExceptionsManagerCxxSpecJSI : public TurboModule {
@@ -668,6 +978,7 @@ public:
   virtual jsi::Object getValue(jsi::Runtime &rt, double x, jsi::String y, jsi::Object z) = 0;
   virtual void getValueWithCallback(jsi::Runtime &rt, jsi::Function callback) = 0;
   virtual jsi::Value getValueWithPromise(jsi::Runtime &rt, bool error) = 0;
+  virtual jsi::Value getValueWithOptionalArg(jsi::Runtime &rt, std::optional<jsi::Object> parameter) = 0;
   virtual jsi::String getEnums(jsi::Runtime &rt, double enumInt, double enumFloat, jsi::String enumString) = 0;
 
 };
@@ -778,6 +1089,14 @@ private:
       return bridging::callFromJs<jsi::Value>(
           rt, &T::getValueWithPromise, jsInvoker_, instance_, std::move(error));
     }
+    jsi::Value getValueWithOptionalArg(jsi::Runtime &rt, std::optional<jsi::Object> parameter) override {
+      static_assert(
+          bridging::getParameterCount(&T::getValueWithOptionalArg) == 2,
+          \\"Expected getValueWithOptionalArg(...) to have 2 parameters\\");
+
+      return bridging::callFromJs<jsi::Value>(
+          rt, &T::getValueWithOptionalArg, jsInvoker_, instance_, std::move(parameter));
+    }
     jsi::String getEnums(jsi::Runtime &rt, double enumInt, double enumFloat, jsi::String enumString) override {
       static_assert(
           bridging::getParameterCount(&T::getEnums) == 4,

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

@@ -711,40 +711,6 @@ namespace facebook {
     };
   } // namespace react
 } // namespace facebook
-namespace JS {
-  namespace NativeImagePickerIOS {
-    struct SpecOpenCameraDialogConfig {
-      bool unmirrorFrontFacingCamera() const;
-      bool videoMode() const;
-
-      SpecOpenCameraDialogConfig(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeImagePickerIOS_SpecOpenCameraDialogConfig)
-+ (RCTManagedPointer *)JS_NativeImagePickerIOS_SpecOpenCameraDialogConfig:(id)json;
-@end
-@protocol NativeImagePickerIOSSpec <RCTBridgeModule, RCTTurboModule>
-
-- (void)openCameraDialog:(JS::NativeImagePickerIOS::SpecOpenCameraDialogConfig &)config
-         successCallback:(RCTResponseSenderBlock)successCallback
-          cancelCallback:(RCTResponseSenderBlock)cancelCallback;
-
-@end
-namespace facebook {
-  namespace react {
-    /**
-     * ObjC++ class for module 'NativeImagePickerIOS'
-     */
-    class JSI_EXPORT NativeImagePickerIOSSpecJSI : public ObjCTurboModule {
-    public:
-      NativeImagePickerIOSSpecJSI(const ObjCTurboModule::InitParams &params);
-    };
-  } // namespace react
-} // namespace facebook
 inline double JS::NativeCameraRollManager::GetPhotosParams::first() const
 {
   id const p = _v[@\\"first\\"];
@@ -845,16 +811,6 @@ inline id<NSObject> _Nullable JS::NativeExceptionsManager::ExceptionData::extraD
   id const p = _v[@\\"extraData\\"];
   return p;
 }
-inline bool JS::NativeImagePickerIOS::SpecOpenCameraDialogConfig::unmirrorFrontFacingCamera() const
-{
-  id const p = _v[@\\"unmirrorFrontFacingCamera\\"];
-  return RCTBridgingToBool(p);
-}
-inline bool JS::NativeImagePickerIOS::SpecOpenCameraDialogConfig::videoMode() const
-{
-  id const p = _v[@\\"videoMode\\"];
-  return RCTBridgingToBool(p);
-}
 ",
 }
 `;
@@ -933,6 +889,9 @@ namespace JS {
 - (void)getValueWithPromise:(BOOL)error
                     resolve:(RCTPromiseResolveBlock)resolve
                      reject:(RCTPromiseRejectBlock)reject;
+- (void)getValueWithOptionalArg:(NSDictionary *)parameter
+                        resolve:(RCTPromiseResolveBlock)resolve
+                         reject:(RCTPromiseRejectBlock)reject;
 - (NSString *)getEnums:(double)enumInt
              enumFloat:(double)enumFloat
             enumString:(NSString *)enumString;

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

@@ -377,6 +377,10 @@ public abstract class NativeSampleTurboModuleSpec extends ReactContextBaseJavaMo
   @DoNotStrip
   public abstract void getValueWithPromise(boolean error, Promise promise);
 
+  @ReactMethod
+  @DoNotStrip
+  public abstract void getValueWithOptionalArg(ReadableMap parameter, Promise promise);
+
   @ReactMethod(isBlockingSynchronousMethod = true)
   @DoNotStrip
   public abstract String getEnums(double enumInt, double enumFloat, String enumString);

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

@@ -384,6 +384,11 @@ static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getVal
   return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, \\"getValueWithPromise\\", \\"(ZLcom/facebook/react/bridge/Promise;)V\\", args, count, cachedMethodId);
 }
 
+static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithOptionalArg(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+  static jmethodID cachedMethodId = nullptr;
+  return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, PromiseKind, \\"getValueWithOptionalArg\\", \\"(Lcom/facebook/react/bridge/ReadableMap;Lcom/facebook/react/bridge/Promise;)V\\", args, count, cachedMethodId);
+}
+
 static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getEnums(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
   static jmethodID cachedMethodId = nullptr;
   return static_cast<JavaTurboModule &>(turboModule).invokeJavaMethod(rt, StringKind, \\"getEnums\\", \\"(DDLjava/lang/String;)Ljava/lang/String;\\", args, count, cachedMethodId);
@@ -402,6 +407,7 @@ NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const JavaTurboMo
   methodMap_[\\"getValue\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleSpecJSI_getValue};
   methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback};
   methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise};
+  methodMap_[\\"getValueWithOptionalArg\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithOptionalArg};
   methodMap_[\\"getEnums\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleSpecJSI_getEnums};
 }
 

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

@@ -367,27 +367,6 @@ namespace facebook {
     }
   } // namespace react
 } // namespace facebook
-@implementation RCTCxxConvert (NativeImagePickerIOS_SpecOpenCameraDialogConfig)
-+ (RCTManagedPointer *)JS_NativeImagePickerIOS_SpecOpenCameraDialogConfig:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeImagePickerIOS::SpecOpenCameraDialogConfig>(json);
-}
-@end
-namespace facebook {
-  namespace react {
-    
-    static facebook::jsi::Value __hostFunction_NativeImagePickerIOSSpecJSI_openCameraDialog(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"openCameraDialog\\", @selector(openCameraDialog:successCallback:cancelCallback:), args, count);
-    }
-
-    NativeImagePickerIOSSpecJSI::NativeImagePickerIOSSpecJSI(const ObjCTurboModule::InitParams &params)
-      : ObjCTurboModule(params) {
-        
-        methodMap_[\\"openCameraDialog\\"] = MethodMetadata {3, __hostFunction_NativeImagePickerIOSSpecJSI_openCameraDialog};
-        setMethodArgConversionSelector(@\\"openCameraDialog\\", 0, @\\"JS_NativeImagePickerIOS_SpecOpenCameraDialogConfig:\\");
-    }
-  } // namespace react
-} // namespace facebook
 ",
 }
 `;
@@ -453,6 +432,10 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
     }
 
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithOptionalArg(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithOptionalArg\\", @selector(getValueWithOptionalArg:resolve:reject:), args, count);
+    }
+
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getEnums(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getEnums\\", @selector(getEnums:enumFloat:enumString:), args, count);
     }
@@ -494,6 +477,9 @@ namespace facebook {
         methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise};
         
         
+        methodMap_[\\"getValueWithOptionalArg\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithOptionalArg};
+        
+        
         methodMap_[\\"getEnums\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleSpecJSI_getEnums};
         
         

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

@@ -33,7 +33,7 @@ group = "com.facebook.react"
 
 dependencies {
   implementation(gradleApi())
-  implementation("com.android.tools.build:gradle:7.3.1")
+  implementation("com.android.tools.build:gradle:7.4.0-beta05")
   implementation("com.google.code.gson:gson:2.8.9")
   implementation("com.google.guava:guava:31.0.1-jre")
   implementation("com.squareup:javapoet:1.13.0")
@@ -50,8 +50,8 @@ dependencies {
 }
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_1_8
-  targetCompatibility = JavaVersion.VERSION_1_8
+  sourceCompatibility = JavaVersion.VERSION_11
+  targetCompatibility = JavaVersion.VERSION_11
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {

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

@@ -1,6 +1,6 @@
 {
   "name": "react-native-gradle-plugin",
-  "version": "0.71.8",
+  "version": "0.71.10",
   "description": "⚛️ Gradle Plugin for React Native",
   "homepage": "https://github.com/facebook/react-native/tree/HEAD/packages/react-native-gradle-plugin",
   "repository": {

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

@@ -14,6 +14,7 @@ import com.facebook.react.tasks.GenerateCodegenArtifactsTask
 import com.facebook.react.tasks.GenerateCodegenSchemaTask
 import com.facebook.react.utils.AgpConfiguratorUtils.configureBuildConfigFields
 import com.facebook.react.utils.AgpConfiguratorUtils.configureDevPorts
+import com.facebook.react.utils.BackwardCompatUtils.configureBackwardCompatibilityReactMap
 import com.facebook.react.utils.DependencyUtils.configureDependencies
 import com.facebook.react.utils.DependencyUtils.configureRepositories
 import com.facebook.react.utils.DependencyUtils.readVersionString
@@ -46,9 +47,12 @@ class ReactPlugin : Plugin<Project> {
       configureReactNativeNdk(project, extension)
       configureBuildConfigFields(project)
       configureDevPorts(project)
+      configureBackwardCompatibilityReactMap(project)
 
-      project.extensions.getByType(AndroidComponentsExtension::class.java).onVariants { variant ->
-        project.configureReactTasks(variant = variant, config = extension)
+      project.extensions.getByType(AndroidComponentsExtension::class.java).apply {
+        onVariants(selector().all()) { variant ->
+          project.configureReactTasks(variant = variant, config = extension)
+        }
       }
       configureCodegen(project, extension, isLibrary = false)
     }
@@ -96,7 +100,8 @@ class ReactPlugin : Plugin<Project> {
           // Please note that appNeedsCodegen is triggering a read of the package.json at
           // configuration time as we need to feed the onlyIf condition of this task.
           // Therefore, the appNeedsCodegen needs to be invoked inside this lambda.
-          it.onlyIf { isLibrary || project.needsCodegenFromPackageJson(extension) }
+          val needsCodegenFromPackageJson = project.needsCodegenFromPackageJson(extension)
+          it.onlyIf { isLibrary || needsCodegenFromPackageJson }
         }
 
     // We create the task to produce schema from JS files.
@@ -120,7 +125,8 @@ class ReactPlugin : Plugin<Project> {
               } else {
                 it.jsRootDir.set(extension.jsRootDir)
               }
-              it.onlyIf { isLibrary || project.needsCodegenFromPackageJson(parsedPackageJson) }
+              val needsCodegenFromPackageJson = project.needsCodegenFromPackageJson(extension)
+              it.onlyIf { isLibrary || needsCodegenFromPackageJson }
             }
 
     // We create the task to generate Java code from schema.
@@ -130,7 +136,6 @@ class ReactPlugin : Plugin<Project> {
               it.dependsOn(generateCodegenSchemaTask)
               it.reactNativeDir.set(extension.reactNativeDir)
               it.nodeExecutableAndArgs.set(extension.nodeExecutableAndArgs)
-              it.codegenDir.set(extension.codegenDir)
               it.generatedSrcDir.set(generatedSrcDir)
               it.packageJsonFile.set(findPackageJsonFile(project, extension))
               it.codegenJavaPackageName.set(extension.codegenJavaPackageName)
@@ -139,7 +144,8 @@ class ReactPlugin : Plugin<Project> {
               // Please note that appNeedsCodegen is triggering a read of the package.json at
               // configuration time as we need to feed the onlyIf condition of this task.
               // Therefore, the appNeedsCodegen needs to be invoked inside this lambda.
-              it.onlyIf { isLibrary || project.needsCodegenFromPackageJson(extension) }
+              val needsCodegenFromPackageJson = project.needsCodegenFromPackageJson(extension)
+              it.onlyIf { isLibrary || needsCodegenFromPackageJson }
             }
 
     // We update the android configuration to include the generated sources.

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

@@ -46,8 +46,7 @@ internal fun Project.configureReactTasks(variant: Variant, config: ReactExtensio
       config.debuggableVariants.get().any { it.equals(variant.name, ignoreCase = true) }
 
   configureNewArchPackagingOptions(project, variant)
-  configureJsEnginePackagingOptions(
-      config, variant, isHermesEnabledInThisVariant, isDebuggableVariant)
+  configureJsEnginePackagingOptions(config, variant, isHermesEnabledInThisVariant)
 
   if (!isDebuggableVariant) {
     val bundleTask =

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

@@ -26,8 +26,6 @@ abstract class GenerateCodegenArtifactsTask : Exec() {
 
   @get:Internal abstract val reactNativeDir: DirectoryProperty
 
-  @get:Internal abstract val codegenDir: DirectoryProperty
-
   @get:Internal abstract val generatedSrcDir: DirectoryProperty
 
   @get:InputFile abstract val packageJsonFile: RegularFileProperty
@@ -38,10 +36,6 @@ abstract class GenerateCodegenArtifactsTask : Exec() {
 
   @get:Input abstract val libraryName: Property<String>
 
-  @get:InputFile
-  val combineJsToSchemaCli: Provider<RegularFile> =
-      codegenDir.file("lib/cli/combine/combine-js-to-schema-cli.js")
-
   @get:InputFile
   val generatedSchemaFile: Provider<RegularFile> = generatedSrcDir.file("schema.json")
 

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

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.utils
+
+import java.util.*
+import org.gradle.api.Project
+
+internal object BackwardCompatUtils {
+
+  fun configureBackwardCompatibilityReactMap(project: Project) {
+    if (project.extensions.extraProperties.has("react")) {
+      @Suppress("UNCHECKED_CAST")
+      val reactMap =
+          project.extensions.extraProperties.get("react") as? Map<String, Any?> ?: mapOf()
+      if (reactMap.isNotEmpty()) {
+        project.logger.error(
+            """
+          ********************************************************************************
+ 
+          ERROR: Using old project.ext.react configuration.
+          We identified that your project is using a old configuration block as:
+          
+          project.ext.react = [
+              // ...
+          ]
+          
+          You should migrate to the new configuration:
+          
+          react {
+              // ...
+          }
+          You can find documentation inside `android/app/build.gradle` on how to use it.
+        
+          ********************************************************************************
+          """
+                .trimIndent())
+      }
+    }
+
+    // We set an empty react[] map so if a library is reading it, they will find empty values.
+    project.extensions.extraProperties.set("react", mapOf<String, String>())
+  }
+}

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

@@ -15,30 +15,57 @@ import org.gradle.api.artifacts.repositories.MavenArtifactRepository
 
 internal object DependencyUtils {
 
+  /**
+   * This method takes care of configuring the repositories{} block for both the app and all the 3rd
+   * party libraries which are auto-linked.
+   */
   fun configureRepositories(project: Project, reactNativeDir: File) {
-    with(project) {
-      if (hasProperty("REACT_NATIVE_MAVEN_LOCAL_REPO")) {
-        mavenRepoFromUrl("file://${property("REACT_NATIVE_MAVEN_LOCAL_REPO")}")
+    project.rootProject.allprojects { eachProject ->
+      with(eachProject) {
+        if (hasProperty("REACT_NATIVE_MAVEN_LOCAL_REPO")) {
+          val mavenLocalRepoPath = property("REACT_NATIVE_MAVEN_LOCAL_REPO") as String
+          mavenRepoFromURI(File(mavenLocalRepoPath).toURI())
+        }
+        // We add the snapshot for users on nightlies.
+        mavenRepoFromUrl("https://oss.sonatype.org/content/repositories/snapshots/")
+        repositories.mavenCentral()
+        // Android JSC is installed from npm
+        mavenRepoFromURI(File(reactNativeDir, "../jsc-android/dist").toURI())
+        repositories.google()
+        mavenRepoFromUrl("https://www.jitpack.io")
       }
-      // We add the snapshot for users on nightlies.
-      mavenRepoFromUrl("https://oss.sonatype.org/content/repositories/snapshots/")
-      repositories.mavenCentral()
-      // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-      mavenRepoFromUrl("file://${reactNativeDir}/android")
-      // Android JSC is installed from npm
-      mavenRepoFromUrl("file://${reactNativeDir}/../jsc-android/dist")
-      repositories.google()
-      mavenRepoFromUrl("https://www.jitpack.io")
     }
   }
 
+  /**
+   * 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`.
+   */
   fun configureDependencies(project: Project, versionString: String) {
     if (versionString.isBlank()) return
-    project.configurations.all { configuration ->
-      configuration.resolutionStrategy.force(
-          "com.facebook.react:react-native:${versionString}",
-          "com.facebook.react:hermes-engine:${versionString}",
-      )
+    project.rootProject.allprojects { eachProject ->
+      eachProject.configurations.all { configuration ->
+        // Here we set a dependencySubstitution for both react-native and hermes-engine as those
+        // coordinates are voided due to https://github.com/facebook/react-native/issues/35210
+        // This allows users to import libraries that are still using
+        // implementation("com.facebook.react:react-native:+") and resolve the right dependency.
+        configuration.resolutionStrategy.dependencySubstitution {
+          it.substitute(it.module("com.facebook.react:react-native"))
+              .using(it.module("com.facebook.react:react-android:${versionString}"))
+              .because(
+                  "The react-native artifact was deprecated in favor of react-android due to https://github.com/facebook/react-native/issues/35210.")
+          it.substitute(it.module("com.facebook.react:hermes-engine"))
+              .using(it.module("com.facebook.react:hermes-android:${versionString}"))
+              .because(
+                  "The hermes-engine artifact was deprecated in favor of hermes-android due to https://github.com/facebook/react-native/issues/35210.")
+        }
+        configuration.resolutionStrategy.force(
+            "com.facebook.react:react-android:${versionString}",
+            "com.facebook.react:hermes-android:${versionString}",
+        )
+      }
     }
   }
 
@@ -56,4 +83,7 @@ internal object DependencyUtils {
 
   fun Project.mavenRepoFromUrl(url: String): MavenArtifactRepository =
       project.repositories.maven { it.url = URI.create(url) }
+
+  fun Project.mavenRepoFromURI(uri: URI): MavenArtifactRepository =
+      project.repositories.maven { it.url = uri }
 }

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

@@ -112,36 +112,25 @@ internal object NdkConfiguratorUtils {
       config: ReactExtension,
       variant: Variant,
       hermesEnabled: Boolean,
-      debuggableVariant: Boolean
   ) {
     if (config.enableSoCleanup.get()) {
-      val (excludes, includes) = getPackagingOptionsForVariant(hermesEnabled, debuggableVariant)
+      val (excludes, includes) = getPackagingOptionsForVariant(hermesEnabled)
       variant.packaging.jniLibs.excludes.addAll(excludes)
       variant.packaging.jniLibs.pickFirsts.addAll(includes)
     }
   }
 
-  fun getPackagingOptionsForVariant(
-      hermesEnabled: Boolean,
-      debuggableVariant: Boolean
-  ): Pair<List<String>, List<String>> {
+  fun getPackagingOptionsForVariant(hermesEnabled: Boolean): Pair<List<String>, List<String>> {
     val excludes = mutableListOf<String>()
     val includes = mutableListOf<String>()
     if (hermesEnabled) {
       excludes.add("**/libjsc.so")
       excludes.add("**/libjscexecutor.so")
       includes.add("**/libhermes.so")
-      if (debuggableVariant) {
-        excludes.add("**/libhermes-executor-release.so")
-        includes.add("**/libhermes-executor-debug.so")
-      } else {
-        excludes.add("**/libhermes-executor-debug.so")
-        includes.add("**/libhermes-executor-release.so")
-      }
+      includes.add("**/libhermes_executor.so")
     } else {
       excludes.add("**/libhermes.so")
-      excludes.add("**/libhermes-executor-debug.so")
-      excludes.add("**/libhermes-executor-release.so")
+      excludes.add("**/libhermes_executor.so")
       includes.add("**/libjsc.so")
       includes.add("**/libjscexecutor.so")
     }